v5.4.0.0

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

app/hapservers.py

@@ -92,14 +92,15 @@ for s in servers:
     servers_with_status.append(s[11])
     if service == 'nginx':
         h = (['', ''],)
+        print(str(service_settings))
+        cmd = [
+            "/usr/sbin/nginx -v 2>&1|awk '{print $3}' && systemctl status nginx |grep -e 'Active' |awk '{print $2, $9$10$11$12$13}' && ps ax |grep nginx:|grep -v grep |wc -l"]
         for service_set in service_settings:
             if service_set.server_id == s[0] and service_set.setting == 'dockerized' and service_set.value == '1':
+                container_name = sql.get_setting('nginx_container_name')
                 cmd = [
-                    "docker exec -it nginx /usr/sbin/nginx -v 2>&1|awk '{print $3}' && docker ps |grep nginx |awk '{print $7, $8$9}' && ps ax |grep nginx:|grep -v grep |wc -l"
+                    "docker exec -it "+container_name+" /usr/sbin/nginx -v 2>&1|awk '{print $3}' && docker ps -a -f name="+container_name+" --format '{{.Status}}'|tail -1 && ps ax |grep nginx:|grep -v grep |wc -l"
                 ]
-            else:
-                cmd = [
-                    "/usr/sbin/nginx -v 2>&1|awk '{print $3}' && systemctl status nginx |grep -e 'Active' |awk '{print $2, $9$10$11$12$13}' && ps ax |grep nginx:|grep -v grep |wc -l"]
         try:
             out = funct.ssh_command(s[2], cmd)
             h = ()

app/options.py

@@ -1229,7 +1229,8 @@ if form.getvalue('master'):
     os.system("cp scripts/%s ." % script)
 
     commands = ["chmod +x " + script + " &&  ./" + script + " PROXY=" + proxy_serv + " SSH_PORT=" + ssh_port +
-                " ETH=" + ETH + " IP=" + str(IP) + " MASTER=MASTER" + " SYN_FLOOD=" + syn_flood + " HOST=" + str(master) +
+                " ETH=" + ETH + " IP=" + str(IP) + " MASTER=MASTER" +
+                " SYN_FLOOD=" + syn_flood + " HOST=" + str(master) +
                 " USER=" + str(ssh_user_name) + " PASS='" + str(ssh_user_password) + "' KEY=" + str(ssh_key_name)]
 
     output, error = funct.subprocess_execute(commands[0])
@@ -1783,7 +1784,18 @@ if form.getvalue('get_hap_v'):
     print(output)
 
 if form.getvalue('get_nginx_v'):
-    cmd = ['/usr/sbin/nginx -v']
+    server_id = sql.select_server_id_by_ip(serv)
+    is_dockerized = sql.select_service_setting(server_id, 'nginx', 'dockerized')
+
+    if is_dockerized == '1':
+        container_name = sql.get_setting('nginx_container_name')
+        cmd = ["docker exec -it "+container_name+" /usr/sbin/nginx -v 2>&1|awk '{print $3}'"]
+    else:
+        cmd = ['/usr/sbin/nginx1 -v']
+    print(funct.ssh_command(serv, cmd))
+
+if form.getvalue('get_keepalived_v'):
+    cmd = ["/usr/sbin/keepalived -v 2>&1|head -1|awk '{print $2}'"]
     print(funct.ssh_command(serv, cmd))
 
 if form.getvalue('get_exporter_v'):

app/scripts/ansible/roles/nginx.yml

@@ -16,8 +16,6 @@
 
 - name: Install docker
   hosts: "{{ variable_host }}"
-  become: yes
-  become_method: sudo
   gather_facts: yes
   roles:
     - role: docker