From 9c5792de53435208605fd7b2af006c544b67a496 Mon Sep 17 00:00:00 2001 From: Alexey Berezhok Date: Tue, 14 Jul 2026 00:29:07 +0300 Subject: [PATCH] Fixes --- .../mgr5/addon/nginx_form_rewrite_plugin.py | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/usr/local/mgr5/addon/nginx_form_rewrite_plugin.py b/usr/local/mgr5/addon/nginx_form_rewrite_plugin.py index 9d66684..6044d37 100755 --- a/usr/local/mgr5/addon/nginx_form_rewrite_plugin.py +++ b/usr/local/mgr5/addon/nginx_form_rewrite_plugin.py @@ -267,14 +267,14 @@ def set_nginx_rewrite_module(enable: bool): except Exception as e: _log(f"Error disabling module in config file {CONFIG_PATH}: {e}") -def make_nginx_custom_template() -> None: +def make_nginx_custom_template() -> bool: tmpl = "/usr/local/mgr5/etc/templates/nginx-vhosts.template" tmpl_ssl = "/usr/local/mgr5/etc/templates/nginx-vhosts-ssl.template" # If templates already exist, abort if os.path.exists(tmpl) or os.path.exists(tmpl_ssl): _log("Error: Custom templates already exist. Aborting make_nginx_custom_template.") - return + return False default_dir = "/usr/local/mgr5/etc/templates/default" default_tmpl = os.path.join(default_dir, "nginx-vhosts.template") @@ -296,7 +296,7 @@ def make_nginx_custom_template() -> None: os.remove(f) except Exception: pass - return + return False # Ensure copied files exist if not os.path.exists(tmpl) or not os.path.exists(tmpl_ssl): @@ -307,7 +307,7 @@ def make_nginx_custom_template() -> None: os.remove(f) except Exception: pass - return + return False patches_dir = "/usr/local/ispmanager-mod_rewrite/patches" patch_tmpl = os.path.join(patches_dir, "nginx-vhosts.template.patch") @@ -346,10 +346,11 @@ def make_nginx_custom_template() -> None: os.remove(f) except Exception: pass - return + return False read_global_config({'param_name': 'templates_created', 'param_value': 'on'}) _log("Success: Custom Nginx templates created and patched successfully.") + return True if __name__ == "__main__": root = etree.parse(stdin).getroot() @@ -399,11 +400,15 @@ if __name__ == "__main__": nginx_mod_rewrite_plugin_menu_global_module_enable = os.getenv("PARAM_nginx_mod_rewrite_plugin_menu_global_module_enable") if os.getenv('PARAM_clicked_button') == 'ok' and nginx_mod_rewrite_plugin_menu_global_module_enable is not None: if nginx_mod_rewrite_plugin_menu_global_module_enable == "on" and mod_rewrite_global not in ("1", "on"): - read_global_config({'param_name': 'global_mod_rewrite_enable', 'param_value': 'on'}) - new_element = etree.Element("nginx_mod_rewrite_plugin_menu_global_module_enable") - new_element.text = "on" - root.append(new_element) - make_nginx_custom_template() + if make_nginx_custom_template(): + read_global_config({'param_name': 'global_mod_rewrite_enable', 'param_value': 'on'}) + new_element = etree.Element("nginx_mod_rewrite_plugin_menu_global_module_enable") + new_element.text = "on" + root.append(new_element) + else: + new_element = etree.Element("nginx_mod_rewrite_plugin_menu_global_module_enable") + new_element.text = "off" + root.append(new_element) elif nginx_mod_rewrite_plugin_menu_global_module_enable == "off" and mod_rewrite_global in ("1", "on"): read_global_config({'param_name': 'global_mod_rewrite_enable', 'param_value': 'off'}) new_element = etree.Element("nginx_mod_rewrite_plugin_menu_global_module_enable")