From 586f4c626f923e1fa4419b39b0c132b83f163dda Mon Sep 17 00:00:00 2001 From: Pavel Loginov Date: Wed, 7 Dec 2022 13:21:55 +0300 Subject: [PATCH] v6.3.1.0 Changelog: https://roxy-wi.org/changelog#6_3_1 --- app/modules/config/config.py | 6 +++--- app/modules/service/common.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/modules/config/config.py b/app/modules/config/config.py index 05c2b21e..7797fba6 100644 --- a/app/modules/config/config.py +++ b/app/modules/config/config.py @@ -7,7 +7,7 @@ import modules.server.ssh as mod_ssh import modules.common.common as common import modules.roxywi.common as roxywi_common import modules.roxy_wi_tools as roxy_wi_tools -from modules.service.common import is_not_allowed_to_restart, get_correct_apache_service_name +import modules.service.common as service_common form = common.form time_zone = sql.get_setting('time_zone') @@ -95,7 +95,7 @@ def upload_and_restart(server_ip: str, cfg: str, **kwargs): if haproxy_enterprise == '1': service_name = "hapee-2.0-lb" if service == 'apache': - service_name = get_correct_apache_service_name(server_ip, 0) + service_name = service_common.get_correct_apache_service_name(server_ip, 0) reload_command = f" && sudo systemctl reload {service_name}" restart_command = f" && sudo systemctl restart {service_name}" @@ -108,7 +108,7 @@ def upload_and_restart(server_ip: str, cfg: str, **kwargs): action = 'reload' reload_or_restart_command = reload_command else: - is_not_allowed_to_restart(server_id, service) + service_common.is_not_allowed_to_restart(server_id, service) action = 'restart' reload_or_restart_command = restart_command diff --git a/app/modules/service/common.py b/app/modules/service/common.py index 0a9a409d..1d9631ae 100644 --- a/app/modules/service/common.py +++ b/app/modules/service/common.py @@ -4,7 +4,6 @@ import http.cookies import modules.db.sql as sql import modules.server.ssh as mod_ssh import modules.common.common as common -import modules.config.config as config_mod import modules.server.server as server_mod import modules.roxy_wi_tools as roxy_wi_tools @@ -129,6 +128,7 @@ def check_nginx_config(server_ip): def overview_backends(server_ip: str, service: str) -> None: from jinja2 import Environment, FileSystemLoader + import modules.config.config as config_mod import modules.config.section as section_mod import modules.roxywi.common as roxywi_common