Просмотр исходного кода

Fix #1809 Delete backend on bulk delete

Jaap Marcus 4 лет назад
Родитель
Сommit
4d4cb5c460
3 измененных файлов с 8 добавлено и 3 удалено
  1. 6 2
      bin/v-delete-web-domain
  2. 1 0
      web/bulk/web/index.php
  3. 1 1
      web/delete/web/index.php

+ 6 - 2
bin/v-delete-web-domain

@@ -67,7 +67,7 @@ fi
 
 # Deleting web backend
 if [ ! -z "$WEB_BACKEND" ]; then
-    $BIN/v-delete-web-domain-backend $user $domain $restart
+    $BIN/v-delete-web-domain-backend $user $domain 'no'
 fi
 
 # Deleting vhost configuration
@@ -142,10 +142,14 @@ fi
 $BIN/v-restart-web $restart
 check_result $? "Web restart failed" >/dev/null
 
-# Restartinh proxy server
+# Restarting proxy server
 $BIN/v-restart-proxy $restart
 check_result $? "Proxy restart failed" >/dev/null
 
+# Restarting backend server
+$BIN/v-restart-web-backend $restart
+check_result $? "Backend restart failed" >/dev/null
+
 # Logging
 $BIN/v-log-action "$user" "Info" "Web" "Deleted web domain (Name: $domain)."
 log_event "$OK" "$ARGUMENTS"

+ 1 - 0
web/bulk/web/index.php

@@ -45,6 +45,7 @@ if (isset($restart)) {
     exec (HESTIA_CMD."v-restart-web", $output, $return_var);
     exec (HESTIA_CMD."v-restart-proxy", $output, $return_var);
     exec (HESTIA_CMD."v-restart-dns", $output, $return_var);
+    exec (HESTIA_CMD."v-restart-web-backend", $output, $return_var);
 }
 
 header("Location: /list/web/");

+ 1 - 1
web/delete/web/index.php

@@ -19,7 +19,7 @@ if (($_SESSION['userContext'] === 'admin') && (!empty($_GET['user']))) {
 if (!empty($_GET['domain'])) {
     $v_username = escapeshellarg($user);
     $v_domain = escapeshellarg($_GET['domain']);
-    exec (HESTIA_CMD."v-delete-web-domain ".$v_username." ".$v_domain, $output, $return_var);
+    exec (HESTIA_CMD."v-delete-web-domain ".$v_username." ".$v_domain." 'yes'", $output, $return_var);
     check_return_code($return_var,$output);
     unset($output);
 }