Merge pull request hestiacp#508 from Lupul/dev-0708

Kristan Kenney · web-flow · commit 9ea30225ed98 · 2019-07-08T20:05:43.000-03:00
Installer: Restart cron service in background
diff --git a/bin/v-restart-cron b/bin/v-restart-cron
@@ -36,11 +36,8 @@ if [ "$1" = "no" ]; then
 fi
 
 # Schedule restart
-if [ "$1" = 'scheduled' ]; then
-    echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
-    exit
-fi
-if [ -z "$1" ] && [ "$SCHEDULED_RESTART" = 'yes' ]; then
+if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
+    sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
     echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
     exit
 fi
diff --git a/bin/v-restart-dns b/bin/v-restart-dns
@@ -41,11 +41,8 @@ if [ "$1" = "no" ]; then
 fi
 
 # Schedule restart
-if [ "$1" = 'scheduled' ]; then
-    echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
-    exit
-fi
-if [ -z "$1" ] && [ "$SCHEDULED_RESTART" = 'yes' ]; then
+if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
+    sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
     echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
     exit
 fi
diff --git a/bin/v-restart-ftp b/bin/v-restart-ftp
@@ -36,11 +36,8 @@ if [ "$1" = "no" ]; then
 fi
 
 # Schedule restart
-if [ "$1" = 'scheduled' ]; then
-    echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
-    exit
-fi
-if [ -z "$1" ] && [ "$SCHEDULED_RESTART" = 'yes' ]; then
+if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
+    sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
     echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
     exit
 fi
diff --git a/bin/v-restart-mail b/bin/v-restart-mail
@@ -36,11 +36,8 @@ if [ "$1" = "no" ]; then
 fi
 
 # Schedule restart
-if [ "$1" = 'scheduled' ]; then
-    echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
-    exit
-fi
-if [ -z "$1" ] && [ "$SCHEDULED_RESTART" = 'yes' ]; then
+if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
+    sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
     echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
     exit
 fi
diff --git a/bin/v-restart-proxy b/bin/v-restart-proxy
@@ -36,11 +36,8 @@ if [ "$1" = "no" ]; then
 fi
 
 # Schedule restart
-if [ "$1" = 'scheduled' ]; then
-    echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
-    exit
-fi
-if [ -z "$1" ] && [ "$SCHEDULED_RESTART" = 'yes' ]; then
+if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
+    sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
     echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
     exit
 fi
diff --git a/bin/v-restart-web b/bin/v-restart-web
@@ -36,11 +36,8 @@ if [ "$1" = "no" ]; then
 fi
 
 # Schedule restart
-if [ "$1" = 'scheduled' ]; then
-    echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
-    exit
-fi
-if [ -z "$1" ] && [ "$SCHEDULED_RESTART" = 'yes' ]; then
+if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
+    sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
     echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
     exit
 fi
diff --git a/bin/v-restart-web-backend b/bin/v-restart-web-backend
@@ -36,11 +36,8 @@ if [ "$1" = "no" ]; then
 fi
 
 # Schedule restart
-if [ "$1" = 'scheduled' ]; then
-    echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
-    exit
-fi
-if [ -z "$1" ] && [ "$SCHEDULED_RESTART" = 'yes' ]; then
+if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
+    sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
     echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
     exit
 fi
diff --git a/install/hst-install-debian.sh b/install/hst-install-debian.sh
@@ -1792,6 +1792,11 @@ $HESTIA/bin/v-add-web-domain admin $servername
 check_result $? "can't create $servername domain"
 
 # Adding cron jobs
+export SCHEDULED_RESTART="yes"
+command="sudo $HESTIA/bin/v-update-sys-queue restart"
+$HESTIA/bin/v-add-cron-job 'admin' '*/2' '*' '*' '*' '*' "$command"
+systemctl restart cron
+
 command="sudo $HESTIA/bin/v-update-sys-queue disk"
 $HESTIA/bin/v-add-cron-job 'admin' '15' '02' '*' '*' '*' "$command"
 command="sudo $HESTIA/bin/v-update-sys-queue traffic"
@@ -1800,8 +1805,6 @@ command="sudo $HESTIA/bin/v-update-sys-queue webstats"
 $HESTIA/bin/v-add-cron-job 'admin' '30' '03' '*' '*' '*' "$command"
 command="sudo $HESTIA/bin/v-update-sys-queue backup"
 $HESTIA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command"
-command="sudo $HESTIA/bin/v-update-sys-queue restart"
-$HESTIA/bin/v-add-cron-job 'admin' '*/2' '*' '*' '*' '*' "$command"
 command="sudo $HESTIA/bin/v-backup-users"
 $HESTIA/bin/v-add-cron-job 'admin' '10' '05' '*' '*' '*' "$command"
 command="sudo $HESTIA/bin/v-update-user-stats"
@@ -1811,7 +1814,6 @@ $HESTIA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command"
 
 # Enable automatic updates
 $HESTIA/bin/v-add-cron-hestia-autoupdate
-systemctl restart cron
 
 # Building initital rrd images
 $HESTIA/bin/v-update-sys-rrd
diff --git a/install/hst-install-ubuntu.sh b/install/hst-install-ubuntu.sh
@@ -1679,6 +1679,11 @@ $HESTIA/bin/v-add-web-domain admin $servername
 check_result $? "can't create $servername domain"
 
 # Adding cron jobs
+export SCHEDULED_RESTART="yes"
+command="sudo $HESTIA/bin/v-update-sys-queue restart"
+$HESTIA/bin/v-add-cron-job 'admin' '*/2' '*' '*' '*' '*' "$command"
+systemctl restart cron
+
 command="sudo $HESTIA/bin/v-update-sys-queue disk"
 $HESTIA/bin/v-add-cron-job 'admin' '15' '02' '*' '*' '*' "$command"
 command="sudo $HESTIA/bin/v-update-sys-queue traffic"
@@ -1687,8 +1692,6 @@ command="sudo $HESTIA/bin/v-update-sys-queue webstats"
 $HESTIA/bin/v-add-cron-job 'admin' '30' '03' '*' '*' '*' "$command"
 command="sudo $HESTIA/bin/v-update-sys-queue backup"
 $HESTIA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command"
-command="sudo $HESTIA/bin/v-update-sys-queue restart"
-$HESTIA/bin/v-add-cron-job 'admin' '*/2' '*' '*' '*' '*' "$command"
 command="sudo $HESTIA/bin/v-backup-users"
 $HESTIA/bin/v-add-cron-job 'admin' '10' '05' '*' '*' '*' "$command"
 command="sudo $HESTIA/bin/v-update-user-stats"
@@ -1698,7 +1701,6 @@ $HESTIA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command"
 
 # Enable automatic updates
 $HESTIA/bin/v-add-cron-hestia-autoupdate
-systemctl restart cron
 
 # Building initital rrd images
 $HESTIA/bin/v-update-sys-rrd
diff --git a/install/upgrade/versions/latest.sh b/install/upgrade/versions/latest.sh
@@ -36,7 +36,7 @@ if [ ! -z "$IMAP_SYSTEM" ]; then
     fi
 fi
 
-if [ -z "$(v-list-cron-jobs admin | grep 'v-update-sys-queue backup')" ]; then
+if [ -z "$($BIN/v-list-cron-jobs admin | grep 'v-update-sys-queue restart')" ]; then
     command="sudo $BIN/v-update-sys-queue restart"
     $BIN/v-add-cron-job 'admin' '*/2' '*' '*' '*' '*' "$command"
 fi
