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

v6.3.0.0 

Changelog: https://roxy-wi.org/changelog#6_3_0
pull/355/head
Pavel Loginov 2022-11-17 18:27:26 +03:00
parent 0d9afd8f42
commit 31d6d62145
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@ def check_haproxy_version(server_ip):
hap_sock_p = sql.get_setting('haproxy_sock_port') hap_sock_p = sql.get_setting('haproxy_sock_port')
ver = "" ver = ""
cmd = f"echo 'show info' |nc {server_ip} {hap_sock_p} |grep Version |awk '{{print $2}}'" cmd = f"echo 'show info' |nc {server_ip} {hap_sock_p} |grep Version |awk '{{print $2}}'"
output, stderr = roxywi_common.logging(cmd) output, stderr = server_mod.subprocess_execute(cmd)
for line in output: for line in output:
ver = line ver = line

6
app/options.py
View File

@ -1321,17 +1321,17 @@ if form.getvalue('install_grafana'):
service_mod.grafana_install() service_mod.grafana_install()
if form.getvalue('haproxy_exp_install'): if form.getvalue('haproxy_exp_install'):
import modules.service.exporter.installation as exp_installation import modules.service.exporter_installation as exp_installation
exp_installation.haproxy_exp_installation() exp_installation.haproxy_exp_installation()
if form.getvalue('nginx_exp_install') or form.getvalue('apache_exp_install'): if form.getvalue('nginx_exp_install') or form.getvalue('apache_exp_install'):
import modules.service.exporter.installation as exp_installation import modules.service.exporter_installation as exp_installation
exp_installation.nginx_apache_exp_installation() exp_installation.nginx_apache_exp_installation()
if form.getvalue('node_exp_install'): if form.getvalue('node_exp_install'):
import modules.service.exporter.installation as exp_installation import modules.service.exporter_installation as exp_installation
exp_installation.node_exp_installation() exp_installation.node_exp_installation()

2
app/waf.py
View File

@ -35,7 +35,7 @@ cfg = ''
roxywi_auth.page_for_admin(level=2) roxywi_auth.page_for_admin(level=2)
print(service)
if service == 'nginx': if service == 'nginx':
roxywi_auth.check_login(user_params['user_uuid'], user_params['token'], service=2) roxywi_auth.check_login(user_params['user_uuid'], user_params['token'], service=2)
servers = roxywi_common.get_dick_permit(nginx=1) servers = roxywi_common.get_dick_permit(nginx=1)