Skip to content

Commit 1123c92

Browse files
ScIT-RaphaelScIT-Raphael
authored
Merge pull request hestiacp#518 from Lupul/bugfix-0709-01
Bugfix 0709 01
2 parents db44a58 + 4213951 commit 1123c92

File tree

9 files changed

+22
-22
lines changed

9 files changed

+22
-22
lines changed

‎bin/v-restart-cron‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fi
3737

3838
# Schedule restart
3939
if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
40-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
40+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
4141
echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
4242
exit
4343
fi
@@ -55,7 +55,7 @@ fi
5555

5656
# Update restart queue
5757
if [ -e "$HESTIA/data/queue/restart.pipe" ]; then
58-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
58+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
5959
fi
6060

6161

‎bin/v-restart-dns‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ fi
4242

4343
# Schedule restart
4444
if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
45-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
45+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
4646
echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
4747
exit
4848
fi
@@ -60,7 +60,7 @@ fi
6060

6161
# Update restart queue
6262
if [ -e "$HESTIA/data/queue/restart.pipe" ]; then
63-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
63+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
6464
fi
6565

6666

‎bin/v-restart-ftp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fi
3737

3838
# Schedule restart
3939
if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
40-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
40+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
4141
echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
4242
exit
4343
fi
@@ -55,7 +55,7 @@ fi
5555

5656
# Update restart queue
5757
if [ -e "$HESTIA/data/queue/restart.pipe" ]; then
58-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
58+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
5959
fi
6060

6161

‎bin/v-restart-mail‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fi
3737

3838
# Schedule restart
3939
if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
40-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
40+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
4141
echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
4242
exit
4343
fi
@@ -64,7 +64,7 @@ fi
6464

6565
# Update restart queue
6666
if [ -e "$HESTIA/data/queue/restart.pipe" ]; then
67-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
67+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
6868
fi
6969

7070

‎bin/v-restart-proxy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fi
3737

3838
# Schedule restart
3939
if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
40-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
40+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
4141
echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
4242
exit
4343
fi
@@ -70,7 +70,7 @@ if [ -f "$HESTIA/web/inc/nginx_proxy" ]; then
7070

7171
# Update restart queue
7272
if [ -e "$HESTIA/data/queue/restart.pipe" ]; then
73-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
73+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
7474
fi
7575
fi
7676

‎bin/v-restart-service‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,11 @@ PATH="$PATH:/usr/local/sbin:/sbin:/usr/sbin:/root/bin"
2323
#----------------------------------------------------------#
2424

2525
check_args '1' "$#" 'SERVICE'
26-
service_status=$(pgrep $service)
2726

2827
#----------------------------------------------------------#
2928
# Action #
3029
#----------------------------------------------------------#
3130

32-
if [ -z "$service_status" ]; then
33-
force="yes"
34-
fi
35-
3631
if [ "$service" = "iptables" ]; then
3732
# Run the restart rules for iptables firewall
3833
$BIN/v-stop-firewall
@@ -45,6 +40,11 @@ elif [ -z "$force" -o "$force" = "no" ] && [ \
4540
"$service" = "bind9" -o \
4641
"$service" = "named" -o \
4742
"$service" = "vsftpd" -o \
43+
"$service" = "php5.6-fpm" -o \
44+
"$service" = "php7.0-fpm" -o \
45+
"$service" = "php7.1-fpm" -o \
46+
"$service" = "php7.2-fpm" -o \
47+
"$service" = "php7.3-fpm" -o \
4848
"$service" = "proftpd" -o \
4949
"$service" = "ssh" -o \
5050
"$service" = "fail2ban" ]; then

‎bin/v-restart-web‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fi
3737

3838
# Schedule restart
3939
if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
40-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
40+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
4141
echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
4242
exit
4343
fi
@@ -55,7 +55,7 @@ if [ $? -ne 0 ]; then
5555

5656
# Update restart queue
5757
if [ -e "$HESTIA/data/queue/restart.pipe" ]; then
58-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
58+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
5959
fi
6060

6161
#----------------------------------------------------------#

‎bin/v-restart-web-backend‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fi
3737

3838
# Schedule restart
3939
if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
40-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
40+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
4141
echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
4242
exit
4343
fi
@@ -63,7 +63,7 @@ fi
6363

6464
# Update restart queue
6565
if [ -e "$HESTIA/data/queue/restart.pipe" ]; then
66-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
66+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
6767
fi
6868

6969

‎func/upgrade.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,13 +201,13 @@ upgrade_rebuild_users() {
201201
for user in `ls /usr/local/hestia/data/users/`; do
202202
echo "(*) Rebuilding domains and account for user: $user..."
203203
if [ ! -z "$WEB_SYSTEM" ]; then
204-
$BIN/v-rebuild-web-domains $user >/dev/null 2>&1
204+
$BIN/v-rebuild-web-domains $user 'no' >/dev/null 2>&1
205205
fi
206206
if [ ! -z "$DNS_SYSTEM" ]; then
207-
$BIN/v-rebuild-dns-domains $user >/dev/null 2>&1
207+
$BIN/v-rebuild-dns-domains $user 'no' >/dev/null 2>&1
208208
fi
209209
if [ ! -z "$MAIL_SYSTEM" ]; then
210-
$BIN/v-rebuild-mail-domains $user >/dev/null 2>&1
210+
$BIN/v-rebuild-mail-domains $user 'no' >/dev/null 2>&1
211211
fi
212212
done
213213
}

0 commit comments

Comments
 (0)