Skip to content

Commit 492b9cf

Browse files
committed
Make restart check mandetory
1 parent 5492a71 commit 492b9cf

File tree

90 files changed

+181
-89
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+181
-89
lines changed

bin/v-add-dns-domain

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ is_format_valid 'user' 'domain' 'ip'
5555
is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
5656
is_object_valid 'user' 'USER' "$user"
5757
is_object_unsuspended 'user' 'USER' "$user"
58+
is_format_valid 'restart'
5859

5960
if [ "$($BIN/v-list-dns-domain $user $domain_utf plain | cut -f 1) " != "$domain" ]; then
6061
is_domain_new 'dns' "$domain_utf"

bin/v-add-dns-on-web-alias

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ is_format_valid 'user' 'alias' 'ip' 'restart'
3535
is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
3636
is_object_valid 'user' 'USER' "$user"
3737
is_object_unsuspended 'user' 'USER' "$user"
38+
3839
if [ -e "$USER_DATA/dns/$alias.conf" ]; then
3940
exit
4041
fi

bin/v-add-dns-record

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,7 @@ is_object_new "dns/$domain" 'ID' "$id"
105105
is_dns_fqnd "$rtype" "$dvalue"
106106
is_dns_nameserver_valid "$domain" "$rtype" "$dvalue"
107107
is_format_valid 'ttl'
108-
if [ -n "$restart" ]; then
109-
is_format_valid 'restart'
110-
fi
108+
is_format_valid 'restart'
111109

112110
# Perform verification if read-only mode is enabled
113111
check_hestia_demo_mode

bin/v-add-mail-domain-ssl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,18 @@ format_domain_idn
5151
#----------------------------------------------------------#
5252

5353
check_args '3' "$#" 'USER DOMAIN SSL_DIR [RESTART]'
54-
is_format_valid 'user' 'domain' 'ssl_dir'
54+
is_format_valid 'user' 'domain' 'ssl_dir' 'restart'
55+
format_no_quotes "$ssl_dir"
5556
is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
5657
is_object_valid 'user' 'USER' "$user"
5758
is_object_unsuspended 'user' 'USER' "$user"
5859
is_object_valid 'mail' 'DOMAIN' "$domain"
5960
is_object_unsuspended 'mail' 'DOMAIN' "$domain"
6061
is_object_value_empty 'mail' 'DOMAIN' "$domain" '$SSL'
62+
if [ -n "$restart" ]; then
63+
is_restart_valid 'restart' "$restart"
64+
fi
65+
6166
is_web_domain_cert_valid
6267

6368
# Perform verification if read-only mode is enabled

bin/v-add-sys-ssh-jail

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
22
# info: add system ssh jail
3-
# options: [RESTART]
3+
# options: NONE
44
#
5-
# example: v-add-sys-ssh-jail yes
5+
# example: v-add-sys-ssh-jail
66
#
77
# This function enables ssh jailed environment.
88

bin/v-add-web-domain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ domain_utf=$(idn2 --quiet -d "$domain_idn")
5050

5151
is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
5252
check_args '2' "$#" 'USER DOMAIN [IP] [RESTART] [ALIASES] [PROXY_EXTENSIONS]'
53-
is_format_valid 'user' 'domain' 'aliases' 'ip' 'proxy_ext'
53+
is_format_valid 'user' 'domain' 'aliases' 'ip' 'proxy_ext' 'restart'
5454
is_object_valid 'user' 'USER' "$user"
5555
is_object_unsuspended 'user' 'USER' "$user"
5656
is_package_full 'WEB_DOMAINS'

bin/v-add-web-domain-alias

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ if [ -z "$aliases" ]; then
4545
fi
4646

4747
check_args '3' "$#" 'USER DOMAIN ALIASES [RESTART]'
48-
is_format_valid 'user' 'domain' 'aliases'
48+
is_format_valid 'user' 'domain' 'aliases' 'restart'
4949
is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
5050
is_object_valid 'user' 'USER' "$user"
5151
is_object_unsuspended 'user' 'USER' "$user"

bin/v-add-web-domain-backend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ source_conf "$HESTIA/conf/hestia.conf"
3333
#----------------------------------------------------------#
3434

3535
check_args '2' "$#" 'USER DOMAIN [TEMPLATE] [RESTART]'
36-
is_format_valid 'user' 'domain'
36+
is_format_valid 'user' 'domain' 'restart'
3737
is_system_enabled "$WEB_BACKEND" 'WEB_BACKEND'
3838
is_object_valid 'user' 'USER' "$user"
3939
is_backend_template_valid "$template"

bin/v-add-web-domain-httpauth

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ check_hestia_demo_mode
4040
#----------------------------------------------------------#
4141

4242
check_args '4' "$#" 'USER DOMAIN AUTH_USER AUTH_PASSWORD [RESTART]'
43-
is_format_valid 'user' 'domain'
43+
is_format_valid 'user' 'domain' 'restart'
4444
is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
4545
is_object_valid 'user' 'USER' "$user"
4646
is_object_unsuspended 'user' 'USER' "$user"

bin/v-add-web-domain-proxy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ source_conf "$HESTIA/conf/hestia.conf"
3737
#----------------------------------------------------------#
3838

3939
check_args '2' "$#" 'USER DOMAIN [TEMPLATE] [EXTENTIONS] [RESTART]'
40-
is_format_valid 'user' 'domain' 'extentions'
40+
is_format_valid 'user' 'domain' 'extentions' 'restart'
4141
is_system_enabled "$PROXY_SYSTEM" 'PROXY_SYSTEM'
4242
is_object_valid 'user' 'USER' "$user"
4343
is_object_unsuspended 'user' 'USER' "$user"

0 commit comments

Comments
 (0)