Просмотр исходного кода

Exit silently on rebuild if user is suspended

Kristan Kenney 5 лет назад
Родитель
Сommit
6828a39a2f

+ 4 - 1
bin/v-rebuild-all

@@ -40,7 +40,10 @@ export PATH=$PATH:/usr/sbin
 check_args '1' "$#" 'USER [RESTART]'
 check_args '1' "$#" 'USER [RESTART]'
 is_format_valid 'user'
 is_format_valid 'user'
 is_object_valid 'user' 'USER' "$user"
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
+check_user=$(is_object_unsuspended 'user' 'USER' "$user")
+if [ ! -z "$check_user" ]; then
+    exit
+fi
 
 
 # Perform verification if read-only mode is enabled
 # Perform verification if read-only mode is enabled
 check_hestia_demo_mode
 check_hestia_demo_mode

+ 4 - 1
bin/v-rebuild-dns-domain

@@ -39,7 +39,10 @@ check_args '2' "$#" 'USER DOMAIN [RESTART] [UPDATE_SERIAL]'
 is_format_valid 'user' 'domain'
 is_format_valid 'user' 'domain'
 is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
+check_user=$(is_object_unsuspended 'user' 'USER' "$user")
+if [ ! -z "$check_user" ]; then
+    exit
+fi
 is_object_valid 'dns' 'DOMAIN' "$domain"
 is_object_valid 'dns' 'DOMAIN' "$domain"
 
 
 # Perform verification if read-only mode is enabled
 # Perform verification if read-only mode is enabled

+ 4 - 1
bin/v-rebuild-dns-domains

@@ -38,7 +38,10 @@ check_args '1' "$#" 'USER [RESTART] [UPDATE_SERIAL]'
 is_format_valid 'user'
 is_format_valid 'user'
 is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
+check_user=$(is_object_unsuspended 'user' 'USER' "$user")
+if [ ! -z "$check_user" ]; then
+    exit
+fi
 if [ "$DNS_SYSTEM" = 'remote' ]; then
 if [ "$DNS_SYSTEM" = 'remote' ]; then
     exit
     exit
 fi
 fi

+ 4 - 1
bin/v-rebuild-mail-domain

@@ -45,7 +45,10 @@ check_args '2' "$#" 'USER DOMAIN'
 is_format_valid 'user' 'domain'
 is_format_valid 'user' 'domain'
 is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
 is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
+check_user=$(is_object_unsuspended 'user' 'USER' "$user")
+if [ ! -z "$check_user" ]; then
+    exit
+fi
 is_object_valid 'mail' 'DOMAIN' "$domain"
 is_object_valid 'mail' 'DOMAIN' "$domain"
 
 
 if [ "$MAIL_SYSTEM" = 'remote' ]; then
 if [ "$MAIL_SYSTEM" = 'remote' ]; then

+ 4 - 1
bin/v-rebuild-mail-domains

@@ -44,7 +44,10 @@ check_args '1' "$#" 'USER'
 is_format_valid 'user'
 is_format_valid 'user'
 is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
 is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
+check_user=$(is_object_unsuspended 'user' 'USER' "$user")
+if [ ! -z "$check_user" ]; then
+    exit
+fi
 if [ "$MAIL_SYSTEM" = 'remote' ]; then
 if [ "$MAIL_SYSTEM" = 'remote' ]; then
     exit
     exit
 fi
 fi

+ 4 - 1
bin/v-rebuild-user

@@ -37,7 +37,10 @@ export PATH=$PATH:/usr/sbin
 check_args '1' "$#" 'USER [RESTART]'
 check_args '1' "$#" 'USER [RESTART]'
 is_format_valid 'user'
 is_format_valid 'user'
 is_object_valid 'user' 'USER' "$user"
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
+check_user=$(is_object_unsuspended 'user' 'USER' "$user")
+if [ ! -z "$check_user" ]; then
+    exit
+fi
 
 
 # Perform verification if read-only mode is enabled
 # Perform verification if read-only mode is enabled
 check_hestia_demo_mode
 check_hestia_demo_mode

+ 4 - 1
bin/v-rebuild-web-domain

@@ -40,7 +40,10 @@ check_args '2' "$#" 'USER DOMAIN [RESTART]'
 is_format_valid 'user' 'domain'
 is_format_valid 'user' 'domain'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
+check_user=$(is_object_unsuspended 'user' 'USER' "$user")
+if [ ! -z "$check_user" ]; then
+    exit
+fi
 is_object_valid 'web' 'DOMAIN' "$domain"
 is_object_valid 'web' 'DOMAIN' "$domain"
 
 
 # Perform verification if read-only mode is enabled
 # Perform verification if read-only mode is enabled

+ 4 - 1
bin/v-rebuild-web-domains

@@ -39,7 +39,10 @@ check_args '1' "$#" 'USER [RESTART]'
 is_format_valid 'user'
 is_format_valid 'user'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
+check_user=$(is_object_unsuspended 'user' 'USER' "$user")
+if [ ! -z "$check_user" ]; then
+    exit
+fi
 
 
 # Perform verification if read-only mode is enabled
 # Perform verification if read-only mode is enabled
 check_hestia_demo_mode
 check_hestia_demo_mode