Преглед изворни кода

Fix suspend/unsuspend order

Mail domain (webmail) depends on DNS and should be suspended first

Relates to #650
Robert Zollner пре 6 година
родитељ
комит
93eb420152
2 измењених фајлова са 10 додато и 8 уклоњено
  1. 5 5
      bin/v-suspend-user
  2. 5 3
      bin/v-unsuspend-user

+ 5 - 5
bin/v-suspend-user

@@ -51,16 +51,16 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
     $BIN/v-suspend-web-domains $user $restart
 fi
 
-# Suspending dns domains
-if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then
-    $BIN/v-suspend-dns-domains $user $restart
-fi
-
 # Suspending mail domains
 if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then
     $BIN/v-suspend-mail-domains $user
 fi
 
+# Suspending dns domains
+if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then
+    $BIN/v-suspend-dns-domains $user $restart
+fi
+
 # Suspending datbabases
 if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then
     $BIN/v-suspend-databases $user

+ 5 - 3
bin/v-unsuspend-user

@@ -42,6 +42,10 @@ for ftp in $(grep "^${user}_" /etc/passwd |cut -f 1 -d : ); do
     /usr/sbin/usermod --unlock $ftp 2>/dev/null
 done
 
+# Changing suspend value
+update_user_value "$user" '$SUSPENDED' 'no'
+decrease_user_value 'admin' '$SUSPENDED_USERS'
+
 # Unsuspending web domains
 if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
     $BIN/v-unsuspend-web-domains $user $restart
@@ -72,9 +76,7 @@ fi
 #                       Hestia                             #
 #----------------------------------------------------------#
 
-# Changing suspend value
-update_user_value "$user" '$SUSPENDED' 'no'
-decrease_user_value 'admin' '$SUSPENDED_USERS'
+
 
 # Restarting system services
 $BIN/v-restart-web $restart