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

v5.3.0.0 

Changelog: https://haproxy-wi.org/changelog.py#5_3
pull/304/head
Pavel Loginov 2021-10-04 17:01:58 +06:00
parent c8874b8fc4
commit 01d74ac0d4
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/create_db.py
View File

@ -32,7 +32,7 @@ def default_values():
{'param': 'local_path_logs', 'value': '/var/log/haproxy.log', 'section': 'logs', {'param': 'local_path_logs', 'value': '/var/log/haproxy.log', 'section': 'logs',
'desc': 'The default local path for saving logs', 'group': '1'}, 'desc': 'The default local path for saving logs', 'group': '1'},
{'param': 'syslog_server_enable', 'value': '0', 'section': 'logs', {'param': 'syslog_server_enable', 'value': '0', 'section': 'logs',
'desc': 'Use the syslog server for HAProxy logs; (0 - no, 1 - yes)', 'group': '1'}, 'desc': 'Enable getting logs from a syslog server; (0 - no, 1 - yes)', 'group': '1'},
{'param': 'syslog_server', 'value': '', 'section': 'logs', 'desc': 'IP address of the syslog_server', {'param': 'syslog_server', 'value': '', 'section': 'logs', 'desc': 'IP address of the syslog_server',
'group': '1'}, 'group': '1'},
{'param': 'log_time_storage', 'value': '14', 'section': 'logs', {'param': 'log_time_storage', 'value': '14', 'section': 'logs',

1
app/metrics.py
View File

@ -23,6 +23,7 @@ try:
if not stderr: if not stderr:
if service_ver[0] == '* is not installed' or service_ver == '': if service_ver[0] == '* is not installed' or service_ver == '':
servers = '' servers = ''
title = 'Metrics service'
else: else:
if service == 'nginx': if service == 'nginx':
if funct.check_login(service=2): if funct.check_login(service=2):

4
app/sql.py
View File

@ -138,7 +138,7 @@ def add_setting_for_new_group(group_id):
{'param': 'local_path_logs', 'value': '/var/log/haproxy.log', 'section': 'logs', {'param': 'local_path_logs', 'value': '/var/log/haproxy.log', 'section': 'logs',
'desc': 'The default local path for saving logs', 'group': group_id}, 'desc': 'The default local path for saving logs', 'group': group_id},
{'param': 'syslog_server_enable', 'value': '0', 'section': 'logs', {'param': 'syslog_server_enable', 'value': '0', 'section': 'logs',
'desc': 'Use the syslog server for HAProxy logs; (0 - no, 1 - yes)', 'group': group_id}, 'desc': 'Enable getting logs from a syslog server; (0 - no, 1 - yes)', 'group': group_id},
{'param': 'syslog_server', 'value': '', 'section': 'logs', 'desc': 'IP address of the syslog_server', {'param': 'syslog_server', 'value': '', 'section': 'logs', 'desc': 'IP address of the syslog_server',
'group': group_id}, 'group': group_id},
{'param': 'stats_user', 'value': 'admin', 'section': 'haproxy', 'desc': 'Username for accessing HAProxy stats page', {'param': 'stats_user', 'value': 'admin', 'section': 'haproxy', 'desc': 'Username for accessing HAProxy stats page',
@ -1350,7 +1350,7 @@ def select_waf_rule_by_id(rule_id):
def update_enable_waf_rules(rule_id, serv, en): def update_enable_waf_rules(rule_id, serv, en):
query = WafRules.update(WafRules=en).where((WafRules.id == rule_id) & (WafRules.serv == serv)) query = WafRules.update(en=en).where((WafRules.id == rule_id) & (WafRules.serv == serv))
try: try:
query.execute() query.execute()
except Exception as e: except Exception as e:

10
inc/overview.js
View File

@ -502,15 +502,25 @@ function serverSettings(id, name) {
} }
function serverSettingsSave(id, name, service, dialog_id) { function serverSettingsSave(id, name, service, dialog_id) {
var haproxy_enterprise = 0; var haproxy_enterprise = 0;
var haproxy_dockerized = 0;
var nginx_dockerized = 0;
if ($('#haproxy_enterprise').is(':checked')) { if ($('#haproxy_enterprise').is(':checked')) {
haproxy_enterprise = '1'; haproxy_enterprise = '1';
} }
if ($('#haproxy_dockerized').is(':checked')) {
haproxy_dockerized = '1';
}
if ($('#nginx_dockerized').is(':checked')) {
nginx_dockerized = '1';
}
$.ajax({ $.ajax({
url: "options.py", url: "options.py",
data: { data: {
serverSettingsSave: id, serverSettingsSave: id,
serverSettingsService: service, serverSettingsService: service,
serverSettingsEnterprise: haproxy_enterprise, serverSettingsEnterprise: haproxy_enterprise,
serverSettingshaproxy_dockerized: haproxy_dockerized,
serverSettingsnginx_dockerized: nginx_dockerized,
token: $('#token').val() token: $('#token').val()
}, },
type: "POST", type: "POST",