Skip to content

Commit 4d4cb5c

Browse files
committed
Fix hestiacp#1809 Delete backend on bulk delete
1 parent 64e3c42 commit 4d4cb5c

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

bin/v-delete-web-domain

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ fi
6767

6868
# Deleting web backend
6969
if [ ! -z "$WEB_BACKEND" ]; then
70-
$BIN/v-delete-web-domain-backend $user $domain $restart
70+
$BIN/v-delete-web-domain-backend $user $domain 'no'
7171
fi
7272

7373
# Deleting vhost configuration
@@ -142,10 +142,14 @@ fi
142142
$BIN/v-restart-web $restart
143143
check_result $? "Web restart failed" >/dev/null
144144

145-
# Restartinh proxy server
145+
# Restarting proxy server
146146
$BIN/v-restart-proxy $restart
147147
check_result $? "Proxy restart failed" >/dev/null
148148

149+
# Restarting backend server
150+
$BIN/v-restart-web-backend $restart
151+
check_result $? "Backend restart failed" >/dev/null
152+
149153
# Logging
150154
$BIN/v-log-action "$user" "Info" "Web" "Deleted web domain (Name: $domain)."
151155
log_event "$OK" "$ARGUMENTS"

web/bulk/web/index.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
exec (HESTIA_CMD."v-restart-web", $output, $return_var);
4646
exec (HESTIA_CMD."v-restart-proxy", $output, $return_var);
4747
exec (HESTIA_CMD."v-restart-dns", $output, $return_var);
48+
exec (HESTIA_CMD."v-restart-web-backend", $output, $return_var);
4849
}
4950

5051
header("Location: /list/web/");

web/delete/web/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
if (!empty($_GET['domain'])) {
2020
$v_username = escapeshellarg($user);
2121
$v_domain = escapeshellarg($_GET['domain']);
22-
exec (HESTIA_CMD."v-delete-web-domain ".$v_username." ".$v_domain, $output, $return_var);
22+
exec (HESTIA_CMD."v-delete-web-domain ".$v_username." ".$v_domain." 'yes'", $output, $return_var);
2323
check_return_code($return_var,$output);
2424
unset($output);
2525
}

0 commit comments

Comments
 (0)