From a7cc68e60ee27679af5f5fa9a707ae49f6acc960 Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Tue, 24 Mar 2020 14:00:09 +0100
Subject: [PATCH] v4.1.0.0

Changelog: https://haproxy-wi.org/changelog.py#4_1
---
 app/scripts/ansible/roles/haproxy/tasks/main.yml      |  3 ++-
 .../ansible/roles/keepalived/tasks/install.yml        |  1 +
 app/scripts/ansible/roles/nginx.yml                   | 11 +++++++++++
 app/templates/ajax/overivewWaf.html                   |  6 ++++--
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/scripts/ansible/roles/haproxy/tasks/main.yml b/app/scripts/ansible/roles/haproxy/tasks/main.yml
index e891555e..0bb542d1 100644
--- a/app/scripts/ansible/roles/haproxy/tasks/main.yml
+++ b/app/scripts/ansible/roles/haproxy/tasks/main.yml
@@ -85,7 +85,7 @@
 - name: Disble SELINUX in env
   shell: setenforce 0
   ignore_errors: yes
-  
+  debugger: never
   
 - name: Enable and start service HAProxy
   systemd:
@@ -123,6 +123,7 @@
     immediate: yes
   ignore_errors: yes
   no_log: True
+  debugger: never
   when: ansible_facts.services["firewalld.service"]['state'] == "running"
   with_items:  [ "{{ STAT_PORT }}", "{{ SOCK_PORT }}" ]
   
diff --git a/app/scripts/ansible/roles/keepalived/tasks/install.yml b/app/scripts/ansible/roles/keepalived/tasks/install.yml
index d261a442..9c765f11 100644
--- a/app/scripts/ansible/roles/keepalived/tasks/install.yml
+++ b/app/scripts/ansible/roles/keepalived/tasks/install.yml
@@ -64,6 +64,7 @@
 - name: Disble SELINUX in env
   shell: setenforce 0
   ignore_errors: yes
+  debugger: never
   
 - name: Enable and start service keepalived
   service:
diff --git a/app/scripts/ansible/roles/nginx.yml b/app/scripts/ansible/roles/nginx.yml
index c59dfc95..27ae9ab0 100644
--- a/app/scripts/ansible/roles/nginx.yml
+++ b/app/scripts/ansible/roles/nginx.yml
@@ -40,7 +40,17 @@
         dest: "{{CONFIG_PATH}}"
         mode: 0644
       when: "'nginx' not in ansible_facts.packages"
+      ignore_errors: yes      
+      
+    - name: Open stat port for firewalld
+      firewalld:
+        port: "{{ STAT_PORT }}/tcp"
+        state: enabled
+        permanent: yes
+        immediate: yes
       ignore_errors: yes
+      no_log: True
+      debugger: never
       
     - htpasswd:
         path: /etc/nginx/status_page_passwdfile
@@ -57,6 +67,7 @@
     - name: Disble SELINUX in env
       shell: setenforce 0 
       ignore_errors: yes
+      debugger: never
       
 - hosts: "{{ variable_host }}"
   become: yes
diff --git a/app/templates/ajax/overivewWaf.html b/app/templates/ajax/overivewWaf.html
index 4e5629ac..3b1d7db7 100644
--- a/app/templates/ajax/overivewWaf.html
+++ b/app/templates/ajax/overivewWaf.html
@@ -60,9 +60,11 @@
 		<td class="padding10 first-collumn-wi">
 			<span class="serverDown server-status"></span> {{ service.0 }}
 		</td>
-		<td colspan="3">
-			{{ service.3 }}
+		{% if role <= 1 %}
+		<td>
+			<a title="Install WAF"><button onclick="installWaf('{{ service.1 }}')">Install</button></a>
 		</td>
+		{% endif %}	
 	{% endif %}
 {% endfor %}
 <script>