Skip to content

Commit 1110d56

Browse files
author
Kristan Kenney
committed
Merge branch 'patches/190628'
2 parents 19b0918 + c45cd06 commit 1110d56

26 files changed

+132
-142
lines changed

‎bin/v-change-sys-hostname‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ if [ -d "/etc/sysconfig" ]; then
4141
fi
4242
else
4343
# Debian/Ubuntu
44+
hostnamectl set-hostname $domain
4445
echo "$domain" > /etc/hostname
4546
fi
4647

‎bin/v-change-sys-service-config‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,14 @@ if [ "$update" = 'yes' ] && [ "$restart" != 'no' ]; then
101101
fi
102102
fi
103103

104-
service $service restart >/dev/null 2>&1
104+
$BIN/v-restart-service $service > /dev/null 2>&1
105+
105106
if [ $? -ne 0 ]; then
106107
for config in $dst; do
107108
cat $config.vst.back > $config
108109
rm -f $config.vst.back
109110
done
110-
check_result $E_RESTART "$service failed to start with new config"
111+
check_result $E_RESTART "ERROR: $service failed to start with new configuration."
111112
fi
112113
fi
113114

‎bin/v-restart-cron‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,10 @@ if [ -z "$CRON_SYSTEM" ] || [ "$CRON_SYSTEM" = 'remote' ]; then
5050
fi
5151

5252
# Restart system
53-
service $CRON_SYSTEM reload >/dev/null 2>&1
53+
$BIN/v-restart-service $CRON_SYSTEM >/dev/null 2>&1
5454
if [ $? -ne 0 ]; then
55-
service $CRON_SYSTEM restart >/dev/null 2>&1
56-
if [ $? -ne 0 ]; then
57-
send_email_report
58-
check_result $E_RESTART "$CRON_SYSTEM restart failed"
59-
fi
55+
send_email_report
56+
check_result $E_RESTART "$CRON_SYSTEM restart failed"
6057
fi
6158

6259
# Update restart queue

‎bin/v-restart-dns‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,10 @@ if [ -z "$DNS_SYSTEM" ] || [ "$DNS_SYSTEM" = 'remote' ] ; then
5555
fi
5656

5757
# Restart system
58-
service $DNS_SYSTEM reload >/dev/null 2>&1
58+
$BIN/v-restart-service $DNS_SYSTEM > /dev/null 2>&1
5959
if [ $? -ne 0 ]; then
60-
service $DNS_SYSTEM restart >/dev/null 2>&1
61-
if [ $? -ne 0 ]; then
62-
send_email_report
63-
check_result $E_RESTART "$DNS_SYSTEM restart failed"
64-
fi
60+
send_email_report
61+
check_result $E_RESTART "$DNS_SYSTEM restart failed"
6562
fi
6663

6764
# Update restart queue

‎bin/v-restart-ftp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ if [ -z "$FTP_SYSTEM" ] || [ "$FTP_SYSTEM" = 'remote' ]; then
5050
fi
5151

5252
# Restart system
53-
service $FTP_SYSTEM restart >/dev/null 2>&1
53+
$BIN/v-restart-service $FTP_SYSTEM > /dev/null 2>&1
5454
if [ $? -ne 0 ]; then
5555
send_email_report
5656
check_result $E_RESTART "$FTP_SYSTEM restart failed"

‎bin/v-restart-mail‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# info: restart mail service
33
# options: NONE
44
#
5-
# The function tells Exim service to reload configuration files.
5+
# The function tells exim or dovecot services to reload configuration files.
66

77

88
#----------------------------------------------------------#
@@ -49,8 +49,17 @@ if [ -z "$MAIL_SYSTEM" ] || [ "$MAIL_SYSTEM" = 'remote' ]; then
4949
exit
5050
fi
5151

52-
# Restart system
53-
service $MAIL_SYSTEM restart >/dev/null 2>&1
52+
# Restart IMAP system if present
53+
if [ ! -z "$IMAP_SYSTEM" ]; then
54+
$BIN/v-restart-service $IMAP_SYSTEM > /dev/null 2>&1
55+
if [ $? -ne 0 ]; then
56+
send_email_report
57+
check_result $E_RESTART "$IMAP_SYSTEM restart failed"
58+
fi
59+
fi
60+
61+
# Restart mail system
62+
$BIN/v-restart-service $MAIL_SYSTEM > /dev/null 2>&1
5463
if [ $? -ne 0 ]; then
5564
send_email_report
5665
check_result $E_RESTART "$MAIL_SYSTEM restart failed"

‎bin/v-restart-proxy‎

Lines changed: 25 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -50,47 +50,31 @@ if [ -z "$PROXY_SYSTEM" ] || [ "$PROXY_SYSTEM" = 'remote' ]; then
5050
fi
5151

5252
if [ -f "$HESTIA/web/inc/nginx_proxy" ]; then
53-
54-
# if hestia is behind default nginx, restart in background with 15 sec delay
55-
# background restart
56-
if [ "$1" = 'background' ]; then
57-
# Restart system
58-
sleep 15
59-
service $PROXY_SYSTEM restart >/dev/null 2>&1
60-
#if [ $? -ne 0 ]; then
61-
# send_email_report
62-
# check_result $E_RESTART "$PROXY_SYSTEM restart failed"
63-
#fi
64-
65-
# Update restart queue
66-
if [ -e "$HESTIA/data/queue/restart.pipe" ]; then
67-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
68-
fi
69-
70-
exit;
71-
fi
72-
73-
# try to reload to get changes faster
74-
service $PROXY_SYSTEM reload
75-
76-
# send to background process
77-
nohup $BIN/v-restart-proxy 'background' &>/dev/null &
78-
79-
else
80-
81-
# Default behaviour
82-
# Restart system
83-
service $PROXY_SYSTEM restart >/dev/null 2>&1
84-
#if [ $? -ne 0 ]; then
85-
# send_email_report
86-
# check_result $E_RESTART "$PROXY_SYSTEM restart failed"
87-
#fi
88-
89-
# Update restart queue
90-
if [ -e "$HESTIA/data/queue/restart.pipe" ]; then
91-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
92-
fi
93-
53+
# if hestia is behind default nginx, restart in background with 15 sec delay
54+
# background restart
55+
if [ "$1" = 'background' ]; then
56+
# Restart system
57+
sleep 15
58+
$BIN/v-restart-service $PROXY_SYSTEM > /dev/null 2>&1
59+
60+
# Update restart queue
61+
if [ -e "$HESTIA/data/queue/restart.pipe" ]; then
62+
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
63+
fi
64+
65+
exit;
66+
fi
67+
# Send to background process
68+
nohup $BIN/v-restart-proxy 'background' &>/dev/null &
69+
else
70+
# Default behaviour
71+
# Restart system
72+
$BIN/v-restart-service $PROXY_SYSTEM > /dev/null 2>&1
73+
74+
# Update restart queue
75+
if [ -e "$HESTIA/data/queue/restart.pipe" ]; then
76+
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
77+
fi
9478
fi
9579

9680
#----------------------------------------------------------#

‎bin/v-restart-service‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
# Argument definition
1313
service=$1
14+
force=$2
1415

1516
# Includes
1617
source $HESTIA/func/main.sh
@@ -23,27 +24,32 @@ PATH="$PATH:/usr/local/sbin:/sbin:/usr/sbin:/root/bin"
2324

2425
check_args '1' "$#" 'SERVICE'
2526

26-
2727
#----------------------------------------------------------#
2828
# Action #
2929
#----------------------------------------------------------#
3030

31-
if [ "$service" != "iptables" ]; then
32-
service $service restart >/dev/null 2>&1
33-
if [ $? -ne 0 ]; then
34-
check_result $E_RESTART "$service restart failed"
35-
fi
36-
else
31+
# Run the restart rules for iptables firewall
32+
if [ "$service" = "iptables" ]; then
3733
$BIN/v-stop-firewall
3834
$BIN/v-update-firewall
39-
if [ $? -ne 0 ]; then
40-
check_result $E_RESTART "$service restart failed"
41-
fi
4235
fi
4336

37+
if [ "$service" = "hestia" ] || [ "$service" = "iptables" ] || [ "$service" = "mariadb" ] || [ "$service" = "mysql" ] || [ "$service" = "postgresql" ] || [ "$service" = "cron" ]; then
38+
systemctl restart $service > /dev/null 2>&1
39+
elif [ -z "$force" ] || [ "$force" = "no" ]; then
40+
systemctl reload $service > /dev/null 2>&1
41+
else
42+
systemctl restart $service > /dev/null 2>&1
43+
fi
4444

4545
#----------------------------------------------------------#
4646
# Hestia #
4747
#----------------------------------------------------------#
4848

49+
# Check the result of the service restart and report whether it failed.
50+
if [ $? -ne 0 ]; then
51+
check_result $E_RESTART "ERROR: Restart of $service failed."
52+
log_history "Restart of $service failed."
53+
fi
54+
4955
exit

‎bin/v-restart-system‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ check_args '1' "$#" 'RESTART'
2828
#----------------------------------------------------------#
2929

3030
if [ "$restart" = 'yes' ]; then
31+
log_history "A restart of the server was initiated."
3132
/sbin/reboot
3233
fi
3334

‎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=$?
52+
$BIN/v-restart-service $WEB_SYSTEM > /dev/null 2>&1
5553

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
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)