Skip to content

Commit 649b4a9

Browse files
author
Kristan Kenney
committed
Update service routine in v-restart-web
1 parent bd3f3d2 commit 649b4a9

File tree

1 file changed

+5
-21
lines changed

1 file changed

+5
-21
lines changed

bin/v-restart-web

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -49,34 +49,18 @@ if [ -z "$WEB_SYSTEM" ] || [ "$WEB_SYSTEM" = 'remote' ]; then
4949
exit
5050
fi
5151

52-
# Reload web system
53-
service $WEB_SYSTEM reload >/dev/null 2>&1
54-
rc=$?
5552

56-
# Workaround for Ubuntu 12.04
57-
if [ "$WEB_SYSTEM" == 'apache2' ]; then
58-
pid1='/var/run/apache2.pid'
59-
pid2='/var/run/apache2/apache2.pid'
60-
if [ ! -e "$pid1" ] && [ ! -e "$pid2" ]; then
61-
rc=1
62-
fi
63-
fi
64-
65-
# Resart web system if reload didn't work
66-
if [ "$rc" -ne 0 ]; then
67-
service $WEB_SYSTEM restart >/dev/null 2>&1
68-
if [ $? -ne 0 ]; then
69-
send_email_report
70-
check_result $E_RESTART "$WEB_SYSTEM restart failed"
71-
fi
72-
fi
53+
systemctl restart $WEB_SYSTEM >/dev/null 2>&1
54+
if [ $? -ne 0 ]; then
55+
send_email_report
56+
check_result $E_RESTART "$WEB_SYSTEM restart failed"
57+
fi
7358

7459
# Update restart queue
7560
if [ -e "$HESTIA/data/queue/restart.pipe" ]; then
7661
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
7762
fi
7863

79-
8064
#----------------------------------------------------------#
8165
# Hestia #
8266
#----------------------------------------------------------#

0 commit comments

Comments
 (0)