github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

v6.3.1.0 

Changelog: https://roxy-wi.org/changelog#6_3_1
pull/355/head
Pavel Loginov 2022-12-07 13:21:55 +03:00
parent 50f4b5061d
commit 586f4c626f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/modules/config/config.py
View File

@ -7,7 +7,7 @@ import modules.server.ssh as mod_ssh
import modules.common.common as common import modules.common.common as common
import modules.roxywi.common as roxywi_common import modules.roxywi.common as roxywi_common
import modules.roxy_wi_tools as roxy_wi_tools 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 form = common.form
time_zone = sql.get_setting('time_zone') 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': if haproxy_enterprise == '1':
service_name = "hapee-2.0-lb" service_name = "hapee-2.0-lb"
if service == 'apache': 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}" reload_command = f" && sudo systemctl reload {service_name}"
restart_command = f" && sudo systemctl restart {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' action = 'reload'
reload_or_restart_command = reload_command reload_or_restart_command = reload_command
else: else:
is_not_allowed_to_restart(server_id, service) service_common.is_not_allowed_to_restart(server_id, service)
action = 'restart' action = 'restart'
reload_or_restart_command = restart_command reload_or_restart_command = restart_command

2
app/modules/service/common.py
View File

@ -4,7 +4,6 @@ import http.cookies
import modules.db.sql as sql import modules.db.sql as sql
import modules.server.ssh as mod_ssh import modules.server.ssh as mod_ssh
import modules.common.common as common import modules.common.common as common
import modules.config.config as config_mod
import modules.server.server as server_mod import modules.server.server as server_mod
import modules.roxy_wi_tools as roxy_wi_tools 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: def overview_backends(server_ip: str, service: str) -> None:
from jinja2 import Environment, FileSystemLoader from jinja2 import Environment, FileSystemLoader
import modules.config.config as config_mod
import modules.config.section as section_mod import modules.config.section as section_mod
import modules.roxywi.common as roxywi_common import modules.roxywi.common as roxywi_common