Skip to content

Commit 75a50c9

Browse files
committed
added option to control restart behaviour
1 parent ed7f052 commit 75a50c9

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

bin/v-delete-domain

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
# Argument defenition
1313
user=$1
1414
domain=$2
15+
restart="${3-yes}"
1516

1617
# Includes
1718
source $VESTA/func/main.sh
@@ -37,7 +38,7 @@ is_object_unsuspended 'user' 'USER' "$user"
3738
if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
3839
check_web=$(grep "DOMAIN='$domain'" $USER_DATA/web.conf)
3940
if [ ! -z "$check_web" ]; then
40-
$BIN/v-delete-web-domain $user $domain
41+
$BIN/v-delete-web-domain $user $domain 'no'
4142
if [ $? -ne 0 ]; then
4243
exit $E_RESTART
4344
fi
@@ -48,7 +49,7 @@ fi
4849
if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then
4950
check_dns=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf)
5051
if [ ! -z "$check_dns" ]; then
51-
$BIN/v-delete-dns-domain $user $domain
52+
$BIN/v-delete-dns-domain $user $domain 'no'
5253
if [ $? -ne 0 ]; then
5354
exit $E_RESTART
5455
fi
@@ -69,12 +70,20 @@ fi
6970
# Check domain status
7071
if [ -z "$check_web" ] && [ -z "$check_dns" ] && [ -z "$check_mail" ]; then
7172
echo "Error: domain $domain doesn't exist"
72-
log_event "$E_NOTEXIST $EVENT"
73+
log_event "$E_NOTEXIST" "$EVENT"
7374
exit $E_NOTEXIST
7475
fi
7576

77+
# Restart services
78+
if [ "$restart" != 'no' ]; then
79+
$BIN/v-restart-web
80+
$BIN/v-restart-proxy
81+
$BIN/v-restart-dns
82+
fi
83+
84+
7685
#----------------------------------------------------------#
7786
# Vesta #
7887
#----------------------------------------------------------#
7988

80-
exit
89+
exit

0 commit comments

Comments
 (0)