v5.3.2.0

Changelog: https://haproxy-wi.org/changelog.py#5_3_2

README.md

@@ -12,10 +12,10 @@ Web interface(user-friendly web GUI, alerting, monitoring and secure) for managi
 ![alt text](https://roxy-wi.org/inc/images/viewstat.png "HAProxy state page")
 
 # Features:
-1. Installation and updating HAProxy, Nginx and Keepalived with Roxy-WI as system service
+1. Installing and updating HAProxy, Nginx and Keepalived with Roxy-WI as a system service
-1. Installation and updating HAProxy and Nginx with Roxy-WI as Docker service
+1. Installing and updating HAProxy and Nginx with Roxy-WI as a Docker service
-2. Installation and updating Grafana, Prometheus servers with Roxy-WI
+2. Installing and updating Grafana, Prometheus servers with Roxy-WI
-3. Installation and updating HAProxy and Nginx exporters with Roxy-WI
+3. Installing and updating HAProxy and Nginx exporters with Roxy-WI
 4. Server provisioning on AWS, DigitalOcean and G-Core Labs
 5. Downloading, updating and formatting GeoIP to the acceptable format for HAProxy with Roxy-WI
 6. Dynamic change of Maxconn, Black/white lists and backend's IP address and port with saving changes to the config file

app/options.py

@@ -1808,7 +1808,7 @@ if form.getvalue('bwlists_save'):
             except Exception:
                 pass
 
-            server_id = sql.select_server_id_by_ip(server=serv)
+            server_id = sql.select_server_id_by_ip(server_ip=serv)
             haproxy_enterprise = sql.select_service_setting(server_id, 'haproxy', 'haproxy_enterprise')
             if haproxy_enterprise == '1':
                 haproxy_service_name = "hapee-2.0-lb"
@@ -2080,16 +2080,17 @@ if form.getvalue('updateserver') is not None:
 if form.getvalue('serverdel') is not None:
     server_id = form.getvalue('serverdel')
     server = sql.select_servers(id=server_id)
+    server_ip = ''
     for s in server:
         hostname = s[1]
-        ip = s[2]
+        server_ip = s[2]
-    if sql.check_exists_backup(ip):
+    if sql.check_exists_backup(server_ip):
         print('warning: Delete the backup first ')
         sys.exit()
     if sql.delete_server(server_id):
         sql.delete_waf_server(server_id)
         sql.delete_port_scanner_settings(server_id)
-        sql.delete_waf_rules(ip)
+        sql.delete_waf_rules(server_ip)
         sql.delete_action_history(server_id)
         print("Ok")
         funct.logging(hostname, ' has been deleted server with ', haproxywi=1, login=1)

app/templates/ajax/config_show.html

@@ -268,7 +268,7 @@
 					{{ line }}
 				</span><br />	
 			{% endif %}
-			{%- if "bind" in line and "@" not in line -%}
+			{%- if "bind" in line and "@" not in line and "-" not int line -%}
 				{%- set bind = line.split(':')[1] -%}
 				{%- set bind = bind.split(' ') -%}
 				<script>

app/templates/delver.html

@@ -31,12 +31,12 @@
 		{% endif %}
 	{% endif %}
 	<div id="config_version_div"></div>
-	{% if not aftersave  %}
+	{% if not aftersave %}
 		<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px; margin-top: 40%">
 			Here you can work with previous versions of {%if service == 'keepalived' %}Keepalived{%elif service == 'nginx' %}Nginx{%else%}HAProxy{%endif%} configs. Roll back to them, view or delete
 		</div>
 	{% endif %}
-	{% if open %}
+	{% if open and not aftersave %}
 	{% for select in selects %}
 		{% if select.2 == serv %}
 			<script>showListOfVersion(1)</script>