Skip to content

Commit 6828a39

Browse files
author
Kristan Kenney
committed
Exit silently on rebuild if user is suspended
1 parent 71303b3 commit 6828a39

File tree

8 files changed

+32
-8
lines changed

8 files changed

+32
-8
lines changed

bin/v-rebuild-all

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ export PATH=$PATH:/usr/sbin
4040
check_args '1' "$#" 'USER [RESTART]'
4141
is_format_valid 'user'
4242
is_object_valid 'user' 'USER' "$user"
43-
is_object_unsuspended 'user' 'USER' "$user"
43+
check_user=$(is_object_unsuspended 'user' 'USER' "$user")
44+
if [ ! -z "$check_user" ]; then
45+
exit
46+
fi
4447

4548
# Perform verification if read-only mode is enabled
4649
check_hestia_demo_mode

bin/v-rebuild-dns-domain

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@ check_args '2' "$#" 'USER DOMAIN [RESTART] [UPDATE_SERIAL]'
3939
is_format_valid 'user' 'domain'
4040
is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
4141
is_object_valid 'user' 'USER' "$user"
42-
is_object_unsuspended 'user' 'USER' "$user"
42+
check_user=$(is_object_unsuspended 'user' 'USER' "$user")
43+
if [ ! -z "$check_user" ]; then
44+
exit
45+
fi
4346
is_object_valid 'dns' 'DOMAIN' "$domain"
4447

4548
# Perform verification if read-only mode is enabled

bin/v-rebuild-dns-domains

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ check_args '1' "$#" 'USER [RESTART] [UPDATE_SERIAL]'
3838
is_format_valid 'user'
3939
is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
4040
is_object_valid 'user' 'USER' "$user"
41-
is_object_unsuspended 'user' 'USER' "$user"
41+
check_user=$(is_object_unsuspended 'user' 'USER' "$user")
42+
if [ ! -z "$check_user" ]; then
43+
exit
44+
fi
4245
if [ "$DNS_SYSTEM" = 'remote' ]; then
4346
exit
4447
fi

bin/v-rebuild-mail-domain

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@ check_args '2' "$#" 'USER DOMAIN'
4545
is_format_valid 'user' 'domain'
4646
is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
4747
is_object_valid 'user' 'USER' "$user"
48-
is_object_unsuspended 'user' 'USER' "$user"
48+
check_user=$(is_object_unsuspended 'user' 'USER' "$user")
49+
if [ ! -z "$check_user" ]; then
50+
exit
51+
fi
4952
is_object_valid 'mail' 'DOMAIN' "$domain"
5053

5154
if [ "$MAIL_SYSTEM" = 'remote' ]; then

bin/v-rebuild-mail-domains

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ check_args '1' "$#" 'USER'
4444
is_format_valid 'user'
4545
is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
4646
is_object_valid 'user' 'USER' "$user"
47-
is_object_unsuspended 'user' 'USER' "$user"
47+
check_user=$(is_object_unsuspended 'user' 'USER' "$user")
48+
if [ ! -z "$check_user" ]; then
49+
exit
50+
fi
4851
if [ "$MAIL_SYSTEM" = 'remote' ]; then
4952
exit
5053
fi

bin/v-rebuild-user

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ export PATH=$PATH:/usr/sbin
3737
check_args '1' "$#" 'USER [RESTART]'
3838
is_format_valid 'user'
3939
is_object_valid 'user' 'USER' "$user"
40-
is_object_unsuspended 'user' 'USER' "$user"
40+
check_user=$(is_object_unsuspended 'user' 'USER' "$user")
41+
if [ ! -z "$check_user" ]; then
42+
exit
43+
fi
4144

4245
# Perform verification if read-only mode is enabled
4346
check_hestia_demo_mode

bin/v-rebuild-web-domain

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ check_args '2' "$#" 'USER DOMAIN [RESTART]'
4040
is_format_valid 'user' 'domain'
4141
is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
4242
is_object_valid 'user' 'USER' "$user"
43-
is_object_unsuspended 'user' 'USER' "$user"
43+
check_user=$(is_object_unsuspended 'user' 'USER' "$user")
44+
if [ ! -z "$check_user" ]; then
45+
exit
46+
fi
4447
is_object_valid 'web' 'DOMAIN' "$domain"
4548

4649
# Perform verification if read-only mode is enabled

bin/v-rebuild-web-domains

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@ check_args '1' "$#" 'USER [RESTART]'
3939
is_format_valid 'user'
4040
is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
4141
is_object_valid 'user' 'USER' "$user"
42-
is_object_unsuspended 'user' 'USER' "$user"
42+
check_user=$(is_object_unsuspended 'user' 'USER' "$user")
43+
if [ ! -z "$check_user" ]; then
44+
exit
45+
fi
4346

4447
# Perform verification if read-only mode is enabled
4548
check_hestia_demo_mode

0 commit comments

Comments
 (0)