From a2988a71d74bc295790544d613672a6ef23c5a51 Mon Sep 17 00:00:00 2001 From: Alexey Berezhok Date: Sat, 14 Dec 2024 23:10:43 +0300 Subject: [PATCH] Added passeneg manager. Part 3 --- web/edit/web/index.php | 19 +++++++- web/extm/passenger_manager/edit/index.php | 2 +- web/templates/pages/edit_web.php | 44 +++++++++++++++++++ .../pages/extmodules_passenger_manager.php | 4 +- 4 files changed, 65 insertions(+), 4 deletions(-) diff --git a/web/edit/web/index.php b/web/edit/web/index.php index 383798c..6c5badf 100644 --- a/web/edit/web/index.php +++ b/web/edit/web/index.php @@ -184,10 +184,26 @@ $stats = json_decode(implode("", $output), true); unset($output); //Check if passenger enabled +$passenger_state = "disabled"; exec(HESTIA_CMD . "v-ext-modules state passenger_manager json", $output, $return_var); $check_passenger_enabled = json_decode(implode("", $output), true); +unset($output); if (($return_var == 0) && (!empty($check_passenger_enabled)) && ($check_passenger_enabled[0]["STATE"] == "enabled")){ - //TODO + $passenger_state = "enabled"; + exec(HESTIA_CMD . "v-ext-modules-run passenger_manager get_rubys json", $output, $return_var); + $rubys = json_decode(implode("", $output), true); + unset($output); + if ($return_var != 0){ + $passenger_state = "disabled"; + } else { + $ruby_domain = quoteshellarg($v_domain); + exec(HESTIA_CMD . "v-ext-modules-run passenger_manager get_user_ruby " . $ruby_domain . " json", $output, $return_var); + $domain_ruby = json_decode(implode("", $output), true); + unset($output); + if ($return_var != 0){ + $passenger_state = "disabled"; + } + } } unset($output); @@ -431,6 +447,7 @@ if (!empty($_POST["save"])) { if (!empty($_POST["v_proxy_template"])) { $v_proxy_template = $_POST["v_proxy_template"]; } + $v_proxy_port = "0"; if (!empty($_POST["v_proxy_port"])) { $v_proxy_port = $_POST["v_proxy_port"]; } diff --git a/web/extm/passenger_manager/edit/index.php b/web/extm/passenger_manager/edit/index.php index 5469a17..c620c32 100644 --- a/web/extm/passenger_manager/edit/index.php +++ b/web/extm/passenger_manager/edit/index.php @@ -42,7 +42,7 @@ if ((!empty($_GET["del"])) && ($_GET["del"] != "")) { // Data exec(HESTIA_CMD . "v-ext-modules-run passenger_manager get_rubys json", $output, $return_var); $rubys = []; -if ($return_var != 0) { +if ($return_var == 0) { $rubys = json_decode(implode("", $output), true); ksort($rubys); } else { diff --git a/web/templates/pages/edit_web.php b/web/templates/pages/edit_web.php index 9dcf352..2d3214d 100644 --- a/web/templates/pages/edit_web.php +++ b/web/templates/pages/edit_web.php @@ -33,6 +33,13 @@ letsEncryptEnabled: , showCertificates: , showAdvanced: false, + + showPassenger: false, + nginxCacheEnabled: , proxySupportEnabled: , customDocumentRootEnabled: @@ -457,6 +464,43 @@ + +
+ +
+
+ +
+ + +
+
+ + +
+ +
+ diff --git a/web/templates/pages/extmodules_passenger_manager.php b/web/templates/pages/extmodules_passenger_manager.php index f4f4764..5455225 100644 --- a/web/templates/pages/extmodules_passenger_manager.php +++ b/web/templates/pages/extmodules_passenger_manager.php @@ -18,11 +18,11 @@