implemented scheduled restart

bin/v-add-cron-job

@@ -1,6 +1,6 @@
 #!/bin/bash
 # info: add cron job
-# options: USER MIN HOUR DAY MONTH WDAY COMMAND [JOB]
+# options: USER MIN HOUR DAY MONTH WDAY COMMAND [JOB] [RESTART]
 #
 # The function adds a job to cron daemon. When executing commands, any output
 # is  mailed to user's email if parameter REPORTS is set to 'yes'.
@@ -19,6 +19,7 @@ month=$5
 wday=$6
 command=$(echo $7 | sed -e "s/'/%quote%/g")
 job=$8
+restart=$9
 
 # Includes
 source $VESTA/conf/vesta.conf
@@ -32,7 +33,7 @@ A7="$command"
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-check_args '7' "$#" 'USER MIN HOUR DAY MONTH WDAY COMMAND [JOB]'
+check_args '7' "$#" 'USER MIN HOUR DAY MONTH WDAY COMMAND [JOB] [RESTART]'
 validate_format 'user' 'min' 'hour' 'day' 'month' 'wday' 'command'
 is_system_enabled "$CRON_SYSTEM" 'CRON_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
@@ -72,7 +73,7 @@ sync_cron_jobs
 increase_user_value $user '$U_CRON_JOBS'
 
 # Restart crond
-$BIN/v-restart-cron "$EVENT"
+$BIN/v-restart-cron
 
 # Logging
 log_history "added cron job $job"

bin/v-add-cron-report

@@ -45,7 +45,7 @@ sync_cron_jobs
 #----------------------------------------------------------#
 
 # Restart crond
-$BIN/v-restart-cron "$EVENT"
+$BIN/v-restart-cron
 
 # Logging
 log_history "enabled cron reporting"

bin/v-add-remote-dns-domain

@@ -94,13 +94,13 @@ for cluster_str in $(cat $VESTA/conf/dns-cluster.conf); do
     # Sync domain
     str=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf)
     eval $str
-    $send_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME
+    $send_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'flush' 'no'
 
     # Sync records
     if [ "$TYPE" = 'ssh' ]; then
         tmp=$(mktemp -u)
         scp_cmd $USER_DATA/dns/$DOMAIN.conf $tmp
-        $send_cmd v-insert-dns-records $DNS_USER $DOMAIN $tmp
+        $send_cmd v-insert-dns-records $DNS_USER $DOMAIN $tmp 'no'
     else
         for str in $(cat $USER_DATA/dns/$DOMAIN.conf); do
             str=$(echo "$str" | sed 's/"/\\"/g')
@@ -109,7 +109,7 @@ for cluster_str in $(cat $VESTA/conf/dns-cluster.conf); do
     fi
 
     # Rebuild dns zone
-    $send_cmd v-rebuild-dns-domain $DNS_USER $domain no
+    $send_cmd v-rebuild-dns-domain $DNS_USER $domain 'scheduled'
     if [ $? -ne 0 ]; then
         echo "Error: $TYPE connection to $HOST failed (rebuild)"
         log_event "$E_CONNECT $EVENT"

bin/v-add-remote-dns-record

@@ -96,10 +96,10 @@ for cluster_str in $(cat $VESTA/conf/dns-cluster.conf); do
     # Sync record
     str=$(grep "ID='$id'" $USER_DATA/dns/$domain.conf)
     str=$(echo "$str" | sed 's/"/\\"/g')
-    $send_cmd v-insert-dns-record $DNS_USER $domain "$str"
+    $send_cmd v-insert-dns-record $DNS_USER $domain "$str" 'no'
 
     # Rebuild dns zone
-    $send_cmd v-rebuild-dns-domain $DNS_USER $domain no
+    $send_cmd v-rebuild-dns-domain $DNS_USER $domain 'scheduled'
     if [ $? -ne 0 ]; then
         echo "Error: $TYPE connection to $HOST failed (rebuild)"
         log_event "$E_CONNECT $EVENT"

bin/v-add-web-domain-proxy

@@ -97,7 +97,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$PROXY_EXT' "$extentions"
 
 # Restart web server
 if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-proxy "$EVENT"
+    $BIN/v-restart-proxy
 fi
 
 log_history "enabled proxy support for $domain"

bin/v-add-web-domain-ssl

@@ -124,7 +124,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$SSL' "yes"
 
 # Restart web server
 if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-web "$EVENT"
+    $BIN/v-restart-web
 fi
 
 # Logging

bin/v-change-cron-job

@@ -64,7 +64,7 @@ sync_cron_jobs
 #----------------------------------------------------------#
 
 # Restart crond
-$BIN/v-restart-cron "$EVENT"
+$BIN/v-restart-cron
 
 # Logging
 log_history "changed cron job $job"

bin/v-change-dns-domain-soa

@@ -59,7 +59,7 @@ fi
 
 # Restart named
 if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-dns "$EVENT"
+    $BIN/v-restart-dns
 fi
 
 # Logging

bin/v-change-dns-domain-ttl

@@ -58,7 +58,7 @@ fi
 
 # Restart named
 if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-dns "$EVENT"
+    $BIN/v-restart-dns
 fi
 
 # Logging

bin/v-change-remote-dns-domain-exp

@@ -94,7 +94,7 @@ for cluster_str in $(cat $VESTA/conf/dns-cluster.conf); do
     # Sync domain
     str=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf)
     eval $str
-    $send_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'no'
+    $send_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'scheduled'
 
 done
 

bin/v-change-remote-dns-domain-soa

@@ -97,7 +97,7 @@ for cluster_str in $(cat $VESTA/conf/dns-cluster.conf); do
     $send_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'no'
 
     # Rebuild dns zone
-    $send_cmd v-rebuild-dns-domain $DNS_USER $domain no
+    $send_cmd v-rebuild-dns-domain $DNS_USER $domain 'scheduled'
     if [ $? -ne 0 ]; then
         echo "Error: $TYPE connection to $HOST failed (rebuild)"
         log_event "$E_CONNECT $EVENT"

bin/v-change-remote-dns-domain-ttl

@@ -97,7 +97,7 @@ for cluster_str in $(cat $VESTA/conf/dns-cluster.conf); do
     $send_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'no'
 
     # Rebuild dns zone
-    $send_cmd v-rebuild-dns-domain $DNS_USER $domain no
+    $send_cmd v-rebuild-dns-domain $DNS_USER $domain 'scheduled'
     if [ $? -ne 0 ]; then
         echo "Error: $TYPE connection to $HOST failed (rebuild)"
         log_event "$E_CONNECT $EVENT"

bin/v-change-sys-ip-nat

@@ -66,7 +66,7 @@ fi
 
 # Restart ftp server
 if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-ftp "$EVENT"
+    $BIN/v-restart-ftp
 fi
 
 # Logging

bin/v-delete-cron-job

@@ -53,7 +53,7 @@ sync_cron_jobs
 decrease_user_value "$user" '$U_CRON_JOBS'
 
 # Restart crond
-$BIN/v-restart-cron "$EVENT"
+$BIN/v-restart-cron
 
 # Logging
 log_history "deleted cron job $job"

bin/v-delete-cron-reports

@@ -45,7 +45,7 @@ sync_cron_jobs
 #----------------------------------------------------------#
 
 # Restart crond
-$BIN/v-restart-cron "$EVENT"
+$BIN/v-restart-cron
 
 # Logging
 log_history "disabled cron reporting"

bin/v-delete-dns-domain

@@ -65,7 +65,7 @@ decrease_user_value "$user" '$U_DNS_RECORDS' "$records"
 
 # Restart named
 if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-dns "$EVENT"
+    $BIN/v-restart-dns $restart
 fi
 
 # Logging

bin/v-delete-dns-domains

@@ -42,7 +42,7 @@ done
 #----------------------------------------------------------#
 
 # Restart named
-$BIN/v-restart-dns "$EVENT"
+$BIN/v-restart-dns
 
 # Logging
 log_event "$OK" "$EVENT"

bin/v-delete-dns-domains-src

@@ -45,7 +45,7 @@ done
 
 # Restart named
 if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-dns "$EVENT"
+    $BIN/v-restart-dns
 fi
 
 # Logging

bin/v-delete-remote-dns-domain

@@ -90,7 +90,7 @@ for cluster_str in $(cat $VESTA/conf/dns-cluster.conf); do
     fi
 
     # Sync domain
-    $send_cmd v-delete-dns-domain $DNS_USER $domain 'no'
+    $send_cmd v-delete-dns-domain $DNS_USER $domain 'scheduled'
 
 done
 

bin/v-delete-remote-dns-domains

@@ -96,7 +96,7 @@ for cluster_str in $hosts; do
     fi
 
     # Clean source records
-    $send_cmd v-delete-dns-domains-src $DNS_USER $HOSTNAME no
+    $send_cmd v-delete-dns-domains-src $DNS_USER $HOSTNAME 'no'
     if [ $? -ne 0 ]; then
         echo "Error: $TYPE connection to $HOST failed (cleanup)"
         log_event "$E_CONNECT $EVENT"
@@ -104,7 +104,7 @@ for cluster_str in $hosts; do
     fi
 
     # Rebuild dns zones
-    $send_cmd v-rebuild-dns-domains $DNS_USER
+    $send_cmd v-rebuild-dns-domains $DNS_USER 'scheduled'
     if [ $? -ne 0 ]; then
         echo "Error: $TYPE connection to $HOST failed (rebuild)"
         log_event "$E_CONNECT $EVENT"

bin/v-delete-remote-dns-record

@@ -86,7 +86,7 @@ for cluster_str in $(cat $VESTA/conf/dns-cluster.conf); do
     fi
 
     # Sync domain
-    $send_cmd v-delete-dns-record $DNS_USER $domain $id 'no'
+    $send_cmd v-delete-dns-record $DNS_USER $domain $id 'scheduled'
 
 done
 

bin/v-insert-dns-record

@@ -1,6 +1,6 @@
 #!/bin/bash
 # info: insert dns record
-# options: USER DOMAIN DATA
+# options: USER DOMAIN DATA [RESTART]
 #
 # The function inserts raw dns record to the domain conf
 
@@ -13,6 +13,7 @@
 user=$1
 domain=$2
 data=$3
+restart=$4
 
 # Includes
 source $VESTA/conf/vesta.conf
@@ -23,7 +24,7 @@ source $VESTA/func/main.sh
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-check_args '3' "$#" 'USER DOMAIN DATA'
+check_args '3' "$#" 'USER DOMAIN DATA [RESTART]'
 validate_format 'user' 'domain' 'data'
 is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
@@ -43,6 +44,11 @@ echo "$data" >> $USER_DATA/dns/$domain.conf
 #                       Vesta                              #
 #----------------------------------------------------------#
 
+# Restart named
+if [ "$restart" != 'no' ]; then
+    $BIN/v-restart-dns $restart
+fi
+
 # Logging
 log_event "$OK" "$EVENT"
 

bin/v-insert-dns-records

@@ -1,6 +1,6 @@
 #!/bin/bash
 # info: inserts dns records
-# options: USER DOMAIN DATA_FILE
+# options: USER DOMAIN DATA_FILE [RESTART]
 #
 # The function copy dns record to the domain conf
 
@@ -13,6 +13,7 @@
 user=$1
 domain=$2
 data_file=$3
+restart=$4
 
 # Includes
 source $VESTA/conf/vesta.conf
@@ -23,7 +24,7 @@ source $VESTA/func/main.sh
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-check_args '3' "$#" 'USER DOMAIN DATAFILE'
+check_args '3' "$#" 'USER DOMAIN DATAFILE [RESTART]'
 validate_format 'user' 'domain' 'data_file'
 is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
@@ -46,6 +47,11 @@ fi
 #                       Vesta                              #
 #----------------------------------------------------------#
 
+# Restart named
+if [ "$restart" != 'no' ]; then
+    $BIN/v-restart-dns
+fi
+
 # Logging
 log_event "$OK" "$EVENT"
 

bin/v-rebuild-cron-jobs

@@ -42,7 +42,7 @@ sync_cron_jobs
 
 # Restart crond
 if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-cron "$EVENT"
+    $BIN/v-restart-cron
 fi
 
 # Logging

bin/v-rebuild-dns-domains

@@ -68,7 +68,7 @@ update_user_value "$user" '$SUSPENDED_DNS' "$suspended_dns"
 
 # Restart named
 if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-dns "$EVENT"
+    $BIN/v-restart-dns
 fi
 
 # Logging

bin/v-restart-cron

@@ -18,6 +18,17 @@ source $VESTA/func/main.sh
 #                       Action                             #
 #----------------------------------------------------------#
 
+# Schedule restart
+if [ "$1" = 'scheduled' ]; then
+    echo "$BIN/$SCRIPT now" >> $VESTA/data/queue/restart.pipe
+    exit
+fi
+if [ -z "$1" ] && [ "$SCHEDULED_RESTART" = 'yes' ]; then
+    echo "$BIN/$SCRIPT now" >> $VESTA/data/queue/restart.pipe
+    exit
+fi
+
+# Restart system
 if [ ! -z "$CRON_SYSTEM" ]; then
     /etc/init.d/$CRON_SYSTEM reload >/dev/null 2>&1
     if [ $? -ne 0 ]; then
@@ -28,6 +39,11 @@ if [ ! -z "$CRON_SYSTEM" ]; then
     fi
 fi
 
+# Update restart queue
+if [ -e "$VESTA/data/queue/restart.pipe" ]; then
+    sed -i "/$SCRIPT/d" $VESTA/data/queue/restart.pipe
+fi
+
 
 #----------------------------------------------------------#
 #                       Vesta                              #

bin/v-restart-dns

@@ -18,6 +18,17 @@ source $VESTA/func/main.sh
 #                       Action                             #
 #----------------------------------------------------------#
 
+# Schedule restart
+if [ "$1" = 'scheduled' ]; then
+    echo "$BIN/$SCRIPT now" >> $VESTA/data/queue/restart.pipe
+    exit
+fi
+if [ -z "$1" ] && [ "$SCHEDULED_RESTART" = 'yes' ]; then
+    echo "$BIN/$SCRIPT now" >> $VESTA/data/queue/restart.pipe
+    exit
+fi
+
+# Restart system
 if [ ! -z "$DNS_SYSTEM" ]; then
     /etc/init.d/$DNS_SYSTEM reload >/dev/null 2>&1
     if [ $? -ne 0 ]; then
@@ -28,6 +39,11 @@ if [ ! -z "$DNS_SYSTEM" ]; then
     fi
 fi
 
+# Update restart queue
+if [ -e "$VESTA/data/queue/restart.pipe" ]; then
+    sed -i "/$SCRIPT/d" $VESTA/data/queue/restart.pipe
+fi
+
 
 #----------------------------------------------------------#
 #                       Vesta                              #

bin/v-restart-ftp

@@ -18,6 +18,17 @@ source $VESTA/func/main.sh
 #                       Action                             #
 #----------------------------------------------------------#
 
+# Schedule restart
+if [ "$1" = 'scheduled' ]; then
+    echo "$BIN/$SCRIPT now" >> $VESTA/data/queue/restart.pipe
+    exit
+fi
+if [ -z "$1" ] && [ "$SCHEDULED_RESTART" = 'yes' ]; then
+    echo "$BIN/$SCRIPT now" >> $VESTA/data/queue/restart.pipe
+    exit
+fi
+
+# Restart system
 if [ ! -z "$FTP_SYSTEM" ]; then
     /etc/init.d/$FTP_SYSTEM reload >/dev/null 2>&1
     if [ $? -ne 0 ]; then
@@ -28,6 +39,11 @@ if [ ! -z "$FTP_SYSTEM" ]; then
     fi
 fi
 
+# Update restart queue
+if [ -e "$VESTA/data/queue/restart.pipe" ]; then
+    sed -i "/$SCRIPT/d" $VESTA/data/queue/restart.pipe
+fi
+
 
 #----------------------------------------------------------#
 #                       Vesta                              #

bin/v-restart-mail

@@ -18,6 +18,17 @@ source $VESTA/func/main.sh
 #                       Action                             #
 #----------------------------------------------------------#
 
+# Schedule restart
+if [ "$1" = 'scheduled' ]; then
+    echo "$BIN/$SCRIPT now" >> $VESTA/data/queue/restart.pipe
+    exit
+fi
+if [ -z "$1" ] && [ "$SCHEDULED_RESTART" = 'yes' ]; then
+    echo "$BIN/$SCRIPT now" >> $VESTA/data/queue/restart.pipe
+    exit
+fi
+
+# Restart system
 if [ ! -z "$MAIL_SYSTEM" ]; then
     /etc/init.d/$MAIL_SYSTEM reload >/dev/null 2>&1
     if [ $? -ne 0 ]; then
@@ -28,6 +39,11 @@ if [ ! -z "$MAIL_SYSTEM" ]; then
     fi
 fi
 
+# Update restart queue
+if [ -e "$VESTA/data/queue/restart.pipe" ]; then
+    sed -i "/$SCRIPT/d" $VESTA/data/queue/restart.pipe
+fi
+
 
 #----------------------------------------------------------#
 #                       Vesta                              #

bin/v-restart-proxy

@@ -18,6 +18,17 @@ source $VESTA/func/main.sh
 #                       Action                             #
 #----------------------------------------------------------#
 
+# Schedule restart
+if [ "$1" = 'scheduled' ]; then
+    echo "$BIN/$SCRIPT now" >> $VESTA/data/queue/restart.pipe
+    exit
+fi
+if [ -z "$1" ] && [ "$SCHEDULED_RESTART" = 'yes' ]; then
+    echo "$BIN/$SCRIPT now" >> $VESTA/data/queue/restart.pipe
+    exit
+fi
+
+# Restart system
 if [ ! -z "$PROXY_SYSTEM" ]; then
     /etc/init.d/$PROXY_SYSTEM reload >/dev/null 2>&1
     if [ $? -ne 0 ]; then
@@ -28,6 +39,11 @@ if [ ! -z "$PROXY_SYSTEM" ]; then
     fi
 fi
 
+# Update restart queue
+if [ -e "$VESTA/data/queue/restart.pipe" ]; then
+    sed -i "/$SCRIPT/d" $VESTA/data/queue/restart.pipe
+fi
+
 
 #----------------------------------------------------------#
 #                       Vesta                              #

bin/v-restart-web

@@ -18,6 +18,17 @@ source $VESTA/func/main.sh
 #                       Action                             #
 #----------------------------------------------------------#
 
+# Schedule restart
+if [ "$1" = 'scheduled' ]; then
+    echo "$BIN/$SCRIPT now" >> $VESTA/data/queue/restart.pipe
+    exit
+fi
+if [ -z "$1" ] && [ "$SCHEDULED_RESTART" = 'yes' ]; then
+    echo "$BIN/$SCRIPT now" >> $VESTA/data/queue/restart.pipe
+    exit
+fi
+
+# Restart system
 if [ ! -z "$WEB_SYSTEM" ]; then
     /etc/init.d/$WEB_SYSTEM reload >/dev/null 2>&1
     if [ $? -ne 0 ]; then
@@ -28,6 +39,11 @@ if [ ! -z "$WEB_SYSTEM" ]; then
     fi
 fi
 
+# Update restart queue
+if [ -e "$VESTA/data/queue/restart.pipe" ]; then
+    sed -i "/$SCRIPT/d" $VESTA/data/queue/restart.pipe
+fi
+
 
 #----------------------------------------------------------#
 #                       Vesta                              #

bin/v-restore-user

@@ -469,7 +469,7 @@ if [ "$dns" != 'no' ]; then
     done
 
     # Restart DNS
-    $BIN/v-restart-dns "$EVENT"
+    $BIN/v-restart-dns
     echo
     msg="$msg\n"
 fi
@@ -682,7 +682,7 @@ if [ "$cron" != 'no' ]; then
     sync_cron_jobs
 
     # Restart cron
-    $BIN/v-restart-cron "$EVENT"
+    $BIN/v-restart-cron
     echo
     msg="$msg\n"
 fi

bin/v-suspend-cron-job

@@ -48,7 +48,7 @@ sync_cron_jobs
 
 # Restart crond
 if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-cron "$EVENT"
+    $BIN/v-restart-cron
 fi
 
 # Logging

bin/v-suspend-cron-jobs

@@ -43,7 +43,7 @@ done
 
 # Restart crond
 if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-cron "$EVENT"
+    $BIN/v-restart-cron
 fi
 
 # Logging

bin/v-suspend-dns-domain

@@ -51,7 +51,7 @@ increase_user_value "$user" '$SUSPENDED_DNS'
 
 # Restart named
 #if [ "$restart" != 'no' ]; then
-#    $BIN/v-restart-dns "$EVENT"
+#    $BIN/v-restart-dns
 #fi
 
 # Logging

bin/v-suspend-dns-domains

@@ -43,9 +43,9 @@ done
 #----------------------------------------------------------#
 
 # Restart dns server
-if [ "$restart" != 'no' ]; then
+#if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-dns "$EVENT"
+#    $BIN/v-restart-dns
-fi
+#fi
 
 # Logging
 log_event "$OK" "$EVENT"

bin/v-suspend-dns-record

@@ -61,9 +61,9 @@ update_domain_zone
 #----------------------------------------------------------#
 
 # Restart named
-if [ "$restart" != 'no' ]; then
+#if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-dns "$EVENT"
+#    $BIN/v-restart-dns
-fi
+#fi
 
 # Logging
 log_event "$OK" "$EVENT"

bin/v-suspend-user

@@ -70,9 +70,9 @@ fi
 
 # Restart web server
 if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-web "$EVENT"
+    $BIN/v-restart-web
-    $BIN/v-restart-dns "$EVENT"
+    $BIN/v-restart-dns
-    $BIN/v-restart-cron "$EVENT"
+    $BIN/v-restart-cron
 fi
 
 # Changing suspend value

bin/v-suspend-web-domains

@@ -44,7 +44,7 @@ done
 
 # Restart web server
 if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-web "$EVENT"
+    $BIN/v-restart-web
 fi
 
 # Logging

bin/v-unsuspend-cron-job

@@ -48,7 +48,7 @@ sync_cron_jobs
 
 # Restart crond
 if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-cron "$EVENT"
+    $BIN/v-restart-cron
 fi
 
 # Logging

bin/v-unsuspend-cron-jobs

@@ -43,7 +43,7 @@ done
 
 # Restart crond
 if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-cron "$EVENT"
+    $BIN/v-restart-cron
 fi
 
 # Logging

bin/v-unsuspend-dns-domain

@@ -53,9 +53,9 @@ sed -i "s/SUSPENDED='yes'/SUSPENDED='no'/g" $USER_DATA/dns/$domain.conf
 
 
 # Restart named
-if [ "$restart" != 'no' ]; then
+#if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-dns "$EVENT"
+#    $BIN/v-restart-dns
-fi
+#fi
 
 # Logging
 log_event "$OK" "$EVENT"

bin/v-unsuspend-dns-domains

@@ -43,9 +43,9 @@ done
 #----------------------------------------------------------#
 
 # Restart dns server
-if [ "$restart" != 'no' ]; then
+#if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-dns "$EVENT"
+#    $BIN/v-restart-dns
-fi
+#fi
 
 # Logging
 log_event "$OK" "$EVENT"

bin/v-unsuspend-dns-record

@@ -60,9 +60,9 @@ update_domain_zone
 #----------------------------------------------------------#
 
 # Restart named
-if [ "$restart" != 'no' ]; then
+#if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-dns "$EVENT"
+#    $BIN/v-restart-dns
-fi
+#fi
 
 # Logging
 log_event "$OK" "$EVENT"

bin/v-unsuspend-user

@@ -72,9 +72,9 @@ update_user_value "$user" '$SUSPENDED' 'no'
 decrease_user_value 'admin' '$SUSPENDED_USERS'
 
 if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-web "$EVENT"
+    $BIN/v-restart-web
-    $BIN/v-restart-dns "$EVENT"
+    $BIN/v-restart-dns
-    $BIN/v-restart-cron "$EVENT"
+    $BIN/v-restart-cron
 fi
 
 # Logging

bin/v-unsuspend-web-domains

@@ -45,7 +45,7 @@ done
 
 # Restart web server
 if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-web "$EVENT"
+    $BIN/v-restart-web
 fi
 
 # Logging