From d975d3cd101c2208206a97ff64d20765b819fe37 Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Tue, 3 Aug 2021 12:30:47 +0600
Subject: [PATCH] v5.2.3.0

Changelog: https://haproxy-wi.org/changelog.py#5_2_3
---
 app/scripts/ansible/roles/haproxy/tasks/main.yml   |  8 ++++++--
 .../ansible/roles/keepalived/tasks/main.yml        |  4 ++++
 app/scripts/ansible/roles/nginx.yml                | 13 +++++++++----
 app/templates/hapservers.html                      |  2 +-
 app/templates/metrics.html                         | 14 +++++++-------
 inc/metrics.js                                     |  8 ++++----
 6 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/app/scripts/ansible/roles/haproxy/tasks/main.yml b/app/scripts/ansible/roles/haproxy/tasks/main.yml
index db6a02fb..f5360418 100644
--- a/app/scripts/ansible/roles/haproxy/tasks/main.yml
+++ b/app/scripts/ansible/roles/haproxy/tasks/main.yml
@@ -111,14 +111,18 @@
    src: selinux.j2
    dest: /etc/selinux/config
   ignore_errors: yes
-  when: '"Enforcing" in sestatus.stdout'
+  when:
+    - sestatus.stdout is defined
+    - '"Enforcing" in sestatus.stdout'
   
   
 - name: Disble SELINUX in env
   shell: setenforce 0 &> /dev/null
   ignore_errors: yes
   debugger: never
-  when: '"Enforcing" in sestatus.stdout'
+  when:
+    - sestatus.stdout is defined
+    - '"Enforcing" in sestatus.stdout'
   
   
 - name: Enable and start service HAProxy
diff --git a/app/scripts/ansible/roles/keepalived/tasks/main.yml b/app/scripts/ansible/roles/keepalived/tasks/main.yml
index 8117a8e5..716157b3 100644
--- a/app/scripts/ansible/roles/keepalived/tasks/main.yml
+++ b/app/scripts/ansible/roles/keepalived/tasks/main.yml
@@ -1,4 +1,8 @@
 ---
+- name: Set SSH port
+  set_fact:
+    ansible_port: "{{SSH_PORT}}"
+    
 - name: Add installation tasks
   include: install.yml
   when: (ADD_VRRP is not defined) or (ADD_VRRP != "1")
diff --git a/app/scripts/ansible/roles/nginx.yml b/app/scripts/ansible/roles/nginx.yml
index 5a219d8c..e7d156ef 100644
--- a/app/scripts/ansible/roles/nginx.yml
+++ b/app/scripts/ansible/roles/nginx.yml
@@ -32,14 +32,14 @@
     - name: Set passlib version
       set_fact:
         passlib_ver: "python3-passlib"
-      when: ansible_facts['distribution_major_version'] == '8' and (ansible_facts['os_family'] == "RedHat" or ansible_facts['os_family'] == 'CentOS')
+      when: (ansible_facts['distribution_major_version'] == '8' and (ansible_facts['os_family'] == "RedHat" or ansible_facts['os_family'] == 'CentOS')) or (ansible_facts['os_family'] == 'Debian' or ansible_facts['os_family'] == 'Ubuntu')
       ignore_errors: True
 
 
     - name: Set passlib version
       set_fact:
         passlib_ver: "python-passlib"
-      when: ansible_facts['distribution_major_version'] == '7' or (ansible_facts['os_family'] == 'Debian' or ansible_facts['os_family'] == 'Ubuntu')
+      when: ansible_facts['distribution_major_version'] == '7'
       ignore_errors: True
 
 
@@ -97,6 +97,7 @@
       command: getenforce
       register: sestatus
       changed_when: false
+      when: ansible_facts['os_family'] == "RedHat" or ansible_facts['os_family'] == 'CentOS'
 
           
     - name: Disble SELINUX in config
@@ -104,14 +105,18 @@
         src: /var/www/haproxy-wi/app/scripts/ansible/roles/haproxy/templates/selinux.j2
         dest: /etc/selinux/config
       ignore_errors: yes
-      when: '"Enforcing" in sestatus.stdout'
+      when:
+        - sestatus.stdout is defined
+        - '"Enforcing" in sestatus.stdout'
       
       
     - name: Disble SELINUX in env
       shell: setenforce 0 
       ignore_errors: yes
       debugger: never
-      when: '"Enforcing" in sestatus.stdout'
+      when:
+        - sestatus.stdout is defined
+        - '"Enforcing" in sestatus.stdout'
       
       
 - hosts: "{{ variable_host }}"
diff --git a/app/templates/hapservers.html b/app/templates/hapservers.html
index ab4dd60f..d8a5735d 100644
--- a/app/templates/hapservers.html
+++ b/app/templates/hapservers.html
@@ -315,7 +315,7 @@
 		<div id="server_metrics_div" class="chart-container" style="display: block; width: 91.3%; height: 300px;">
 			<canvas id="{{s.2}}" role="img"></canvas>
 		</div>
-		<div id="http_metrics_div" class="chart-container" style="display: block; width: 91.3%; height: 300px;">
+		<div class="chart-container http_metrics_div" style="display: block; width: 91.3%; height: 300px;">
 			<canvas id="http_{{s.2}}" role="img"></canvas>
 		</div>
 		<div id="waf_metrics_div" class="chart-container" style="display: block; width: 90%; height: 300px;">
diff --git a/app/templates/metrics.html b/app/templates/metrics.html
index 80362c2e..f6497327 100644
--- a/app/templates/metrics.html
+++ b/app/templates/metrics.html
@@ -55,10 +55,10 @@
 	</div>
 {% for s in servers %}
 	<div class="chart-container">
-		<canvas id="{{s.0}}" role="img"></canvas>
+		<canvas id="{{s.ip}}" role="img"></canvas>
 	</div>
-	<div id="http_metrics_div" class="chart-container">
-		<canvas id="http_{{s.0}}" role="img"></canvas>
+	<div class="chart-container http_metrics_div" style="display: none">
+		<canvas id="http_{{s.ip}}" role="img"></canvas>
 	</div>
 {% endfor %}
 <script>
@@ -67,8 +67,8 @@
 			(resolve, reject) => {
 				removeData();
 				{% for s in servers %}
-					getChartData('{{s.0}}')
-					getHttpChartData('{{s.0}}')
+					getChartData('{{s.ip}}')
+					getHttpChartData('{{s.ip}}')
 				{% endfor %}
 				if (localStorage.getItem('table_metrics') == 0 || localStorage.getItem('table_metrics') === null) {
 					$('#dis_table_metric').css('display', 'none');
@@ -86,8 +86,8 @@
 			let metrics = new Promise(
 					(resolve, reject) => {
 						{% for s in servers %}
-						getChartData('{{s.0}}')
-						getHttpChartData('{{s.0}}')
+						getChartData('{{s.ip}}')
+						getHttpChartData('{{s.ip}}')
 						{% endfor %}
 					});
 			metrics.then();
diff --git a/inc/metrics.js b/inc/metrics.js
index a6ae91d6..4a342c6b 100644
--- a/inc/metrics.js
+++ b/inc/metrics.js
@@ -460,21 +460,21 @@ $( function() {
     if(hide_http_metrics === null) {
         $('#hide_http_metrics').prop('checked', false);
         $('#hide_http_metrics').checkboxradio('refresh');
-        $('#http_metrics_div').show();
+        $('.http_metrics_div').show();
     } else if (hide_http_metrics === 'disabled') {
         $('#hide_http_metrics').prop('checked', true);
         $('#hide_http_metrics').checkboxradio('refresh');
-        $('#http_metrics_div').hide();
+        $('.http_metrics_div').hide();
     }
     // Disable or enable showing http metrics
     $('#hide_http_metrics').change(function() {
         if($(this).is(':checked')) {
             localStorage.setItem('hide_http_metrics', 'disabled');
-            $('#http_metrics_div').hide();
+            $('.http_metrics_div').hide();
             showMetrics();
         } else {
             localStorage.removeItem('hide_http_metrics');
-            $('#http_metrics_div').show();
+            $('.http_metrics_div').show();
             showMetrics();
         }
     });