From 01d74ac0d4a6293b97e7343395f4a40d38bd3e34 Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Mon, 4 Oct 2021 17:01:58 +0600
Subject: [PATCH] v5.3.0.0

Changelog: https://haproxy-wi.org/changelog.py#5_3
---
 app/create_db.py |  2 +-
 app/metrics.py   |  1 +
 app/sql.py       |  4 ++--
 inc/overview.js  | 10 ++++++++++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/create_db.py b/app/create_db.py
index 9a3fa227..61e0e268 100644
--- a/app/create_db.py
+++ b/app/create_db.py
@@ -32,7 +32,7 @@ def default_values():
 		{'param': 'local_path_logs', 'value': '/var/log/haproxy.log', 'section': 'logs',
 		 'desc': 'The default local path for saving logs', 'group': '1'},
 		{'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',
 		 'group': '1'},
 		{'param': 'log_time_storage', 'value': '14', 'section': 'logs',
diff --git a/app/metrics.py b/app/metrics.py
index 7877c630..3ba69fc3 100644
--- a/app/metrics.py
+++ b/app/metrics.py
@@ -23,6 +23,7 @@ try:
 	if not stderr:
 		if service_ver[0] == '* is not installed' or service_ver == '':
 			servers = ''
+			title = 'Metrics service'
 		else:
 			if service == 'nginx':
 				if funct.check_login(service=2):
diff --git a/app/sql.py b/app/sql.py
index dc7e0a18..7e41ab0d 100644
--- a/app/sql.py
+++ b/app/sql.py
@@ -138,7 +138,7 @@ def add_setting_for_new_group(group_id):
 		{'param': 'local_path_logs', 'value': '/var/log/haproxy.log', 'section': 'logs',
 		 'desc': 'The default local path for saving logs', 'group': group_id},
 		{'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',
 		 'group': group_id},
 		{'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):
-	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:
 		query.execute()
 	except Exception as e:
diff --git a/inc/overview.js b/inc/overview.js
index 36054d5f..c7758c79 100644
--- a/inc/overview.js
+++ b/inc/overview.js
@@ -502,15 +502,25 @@ function serverSettings(id, name) {
 }
 function serverSettingsSave(id, name, service, dialog_id) {
 	var haproxy_enterprise = 0;
+	var haproxy_dockerized = 0;
+	var nginx_dockerized = 0;
 	if ($('#haproxy_enterprise').is(':checked')) {
 		haproxy_enterprise = '1';
 	}
+	if ($('#haproxy_dockerized').is(':checked')) {
+		haproxy_dockerized = '1';
+	}
+	if ($('#nginx_dockerized').is(':checked')) {
+		nginx_dockerized = '1';
+	}
 	$.ajax({
 		url: "options.py",
 		data: {
 			serverSettingsSave: id,
 			serverSettingsService: service,
 			serverSettingsEnterprise: haproxy_enterprise,
+			serverSettingshaproxy_dockerized: haproxy_dockerized,
+			serverSettingsnginx_dockerized: nginx_dockerized,
 			token: $('#token').val()
 		},
 		type: "POST",