Skip to content

Commit 93eb420

Browse files
committed
Fix suspend/unsuspend order
Mail domain (webmail) depends on DNS and should be suspended first Relates to hestiacp#650
1 parent 994cb83 commit 93eb420

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

bin/v-suspend-user

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,16 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
5151
$BIN/v-suspend-web-domains $user $restart
5252
fi
5353

54-
# Suspending dns domains
55-
if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then
56-
$BIN/v-suspend-dns-domains $user $restart
57-
fi
58-
5954
# Suspending mail domains
6055
if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then
6156
$BIN/v-suspend-mail-domains $user
6257
fi
6358

59+
# Suspending dns domains
60+
if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then
61+
$BIN/v-suspend-dns-domains $user $restart
62+
fi
63+
6464
# Suspending datbabases
6565
if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then
6666
$BIN/v-suspend-databases $user

bin/v-unsuspend-user

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ for ftp in $(grep "^${user}_" /etc/passwd |cut -f 1 -d : ); do
4242
/usr/sbin/usermod --unlock $ftp 2>/dev/null
4343
done
4444

45+
# Changing suspend value
46+
update_user_value "$user" '$SUSPENDED' 'no'
47+
decrease_user_value 'admin' '$SUSPENDED_USERS'
48+
4549
# Unsuspending web domains
4650
if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
4751
$BIN/v-unsuspend-web-domains $user $restart
@@ -72,9 +76,7 @@ fi
7276
# Hestia #
7377
#----------------------------------------------------------#
7478

75-
# Changing suspend value
76-
update_user_value "$user" '$SUSPENDED' 'no'
77-
decrease_user_value 'admin' '$SUSPENDED_USERS'
79+
7880

7981
# Restarting system services
8082
$BIN/v-restart-web $restart

0 commit comments

Comments
 (0)