Browse Source

added option to control restart behaviour

Serghey Rodin 11 years ago
parent
commit
75a50c9cd6
1 changed files with 13 additions and 4 deletions
  1. 13 4
      bin/v-delete-domain

+ 13 - 4
bin/v-delete-domain

@@ -12,6 +12,7 @@
 # Argument defenition
 # Argument defenition
 user=$1
 user=$1
 domain=$2
 domain=$2
+restart="${3-yes}"
 
 
 # Includes
 # Includes
 source $VESTA/func/main.sh
 source $VESTA/func/main.sh
@@ -37,7 +38,7 @@ is_object_unsuspended 'user' 'USER' "$user"
 if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
 if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
     check_web=$(grep "DOMAIN='$domain'" $USER_DATA/web.conf)
     check_web=$(grep "DOMAIN='$domain'" $USER_DATA/web.conf)
     if [  ! -z "$check_web" ]; then
     if [  ! -z "$check_web" ]; then
-        $BIN/v-delete-web-domain $user $domain
+        $BIN/v-delete-web-domain $user $domain 'no'
         if [ $? -ne 0 ]; then
         if [ $? -ne 0 ]; then
             exit $E_RESTART
             exit $E_RESTART
         fi
         fi
@@ -48,7 +49,7 @@ fi
 if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then
 if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then
     check_dns=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf)
     check_dns=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf)
     if [  ! -z "$check_dns" ]; then
     if [  ! -z "$check_dns" ]; then
-        $BIN/v-delete-dns-domain $user $domain
+        $BIN/v-delete-dns-domain $user $domain 'no'
         if [ $? -ne 0 ]; then
         if [ $? -ne 0 ]; then
             exit $E_RESTART
             exit $E_RESTART
         fi
         fi
@@ -69,12 +70,20 @@ fi
 # Check domain status
 # Check domain status
 if [ -z "$check_web" ] && [ -z "$check_dns" ] && [ -z "$check_mail" ]; then
 if [ -z "$check_web" ] && [ -z "$check_dns" ] && [ -z "$check_mail" ]; then
     echo "Error: domain $domain doesn't exist"
     echo "Error: domain $domain doesn't exist"
-    log_event "$E_NOTEXIST $EVENT"
+    log_event "$E_NOTEXIST" "$EVENT"
     exit $E_NOTEXIST
     exit $E_NOTEXIST
 fi
 fi
 
 
+# Restart services
+if [ "$restart" != 'no' ]; then
+    $BIN/v-restart-web
+    $BIN/v-restart-proxy
+    $BIN/v-restart-dns
+fi
+
+
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 #                       Vesta                              #
 #                       Vesta                              #
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
-exit 
+exit