implemented scheduled restart

Author: serghey-rodin

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