From ab1e72a5bceccf696e1e4f9f447b026e7f91774a Mon Sep 17 00:00:00 2001 From: Pavel Loginov Date: Mon, 23 Dec 2019 18:08:34 +0300 Subject: [PATCH] v3.9.4 --- app/funct.py | 1 + app/scripts/ansible/roles/haproxy/tasks/main.yml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/funct.py b/app/funct.py index d4158ac4..ed83fbf5 100644 --- a/app/funct.py +++ b/app/funct.py @@ -651,6 +651,7 @@ def ssh_command(serv, commands, **kwargs): try: ssh.close() except: + print("
"+str(ssh)+"X
") logging('localhost', ' '+str(ssh), haproxywi=1) pass diff --git a/app/scripts/ansible/roles/haproxy/tasks/main.yml b/app/scripts/ansible/roles/haproxy/tasks/main.yml index 912c33cd..d49c96fd 100644 --- a/app/scripts/ansible/roles/haproxy/tasks/main.yml +++ b/app/scripts/ansible/roles/haproxy/tasks/main.yml @@ -1,5 +1,5 @@ --- -- name: check if HAProxy is installed Ubuntu +- name: check if HAProxy is installed package_facts: manager: "auto" @@ -8,7 +8,7 @@ service_facts: -- name: install HAProxy {{HAPVER}} +- name: install HAProxy {{HAPVER}} on EL6 yum: name: - http://repo.haproxy-wi.org/haproxy-{{HAPVER}}.el6.x86_64.rpm @@ -21,7 +21,7 @@ https_proxy: "{{PROXY}}" -- name: install HAProxy {{HAPVER}} +- name: install HAProxy {{HAPVER}} on EL7 yum: name: - http://repo.haproxy-wi.org/haproxy-{{HAPVER}}.el7.x86_64.rpm