From c216487cacdf74146752095cf97aa78163a387d4 Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Thu, 5 Nov 2020 22:04:38 +0600
Subject: [PATCH] v4.5.3.0

Changelog: https://haproxy-wi.org/changelog.py#4_5_3
---
 app/scripts/backup.sh                   | 6 +++++-
 app/scripts/install_haproxy.sh          | 2 +-
 app/scripts/install_haproxy_exporter.sh | 2 +-
 app/scripts/install_keepalived.sh       | 2 +-
 app/scripts/install_nginx.sh            | 2 +-
 app/scripts/install_nginx_exporter.sh   | 2 +-
 app/scripts/letsencrypt.sh              | 5 ++++-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/scripts/backup.sh b/app/scripts/backup.sh
index 74597d5..795bb7c 100644
--- a/app/scripts/backup.sh
+++ b/app/scripts/backup.sh
@@ -20,10 +20,14 @@ done
 
 export ANSIBLE_HOST_KEY_CHECKING=False
 export ANSIBLE_DISPLAY_SKIPPED_HOSTS=False
+export ACTION_WARNINGS=False
+export LOCALHOST_WARNING=False
+export COMMAND_WARNINGS=False
+
 PWD=`pwd`
 PWD=$PWD/scripts/ansible/
 echo '[backup]' > $PWD/$HOST
-echo $HOST >> $PWD/$HOST
+echo "$HOST ansible_port=$SSH_PORT" >> $PWD/$HOST
 echo '[haproxy_wi]' >> $PWD/$HOST
 echo 'localhost' >> $PWD/$HOST
 
diff --git a/app/scripts/install_haproxy.sh b/app/scripts/install_haproxy.sh
index 1aa2ee2..7649fc9 100644
--- a/app/scripts/install_haproxy.sh
+++ b/app/scripts/install_haproxy.sh
@@ -30,7 +30,7 @@ export COMMAND_WARNINGS=False
 
 PWD=`pwd`
 PWD=$PWD/scripts/ansible/
-echo $HOST > $PWD/$HOST
+echo "$HOST ansible_port=$SSH_PORT" > $PWD/$HOST
 
 if [[ $KEY == "" ]]; then
 	ansible-playbook $PWD/roles/haproxy.yml -e "ansible_user=$USER ansible_ssh_pass=$PASS variable_host=$HOST PROXY=$PROXY HAPVER=$HAPVER SOCK_PORT=$SOCK_PORT STAT_PORT=$STAT_PORT STATS_USER=$STATS_USER STATS_PASS=$STATS_PASS STAT_FILE=$STAT_FILE SSH_PORT=$SSH_PORT SYN_FLOOD=$SYN_FLOOD" -i $PWD/$HOST
diff --git a/app/scripts/install_haproxy_exporter.sh b/app/scripts/install_haproxy_exporter.sh
index 010b11f..9d260d9 100644
--- a/app/scripts/install_haproxy_exporter.sh
+++ b/app/scripts/install_haproxy_exporter.sh
@@ -33,7 +33,7 @@ export ACTION_WARNINGS=False
 export ANSIBLE_DEPRECATION_WARNINGS=False
 PWD=`pwd`
 PWD=$PWD/scripts/ansible/
-echo $HOST > $PWD/$HOST
+echo "$HOST ansible_port=$SSH_PORT" > $PWD/$HOST
 
 if [[ $KEY == "" ]]; then
 	ansible-playbook $PWD/roles/haproxy_exporter.yml -e "ansible_user=$USER ansible_ssh_pass=$PASS variable_host=$HOST PROXY=$PROXY STAT_PAGE=$STAT_PAGE STAT_PORT=$STAT_PORT STATS_USER=$STATS_USER STATS_PASS=$STATS_PASS SSH_PORT=$SSH_PORT" -i $PWD/$HOST
diff --git a/app/scripts/install_keepalived.sh b/app/scripts/install_keepalived.sh
index 9ae7bf4..783a510 100644
--- a/app/scripts/install_keepalived.sh
+++ b/app/scripts/install_keepalived.sh
@@ -29,7 +29,7 @@ export COMMAND_WARNINGS=False
 
 PWD=`pwd`
 PWD=$PWD/scripts/ansible/
-echo $HOST > $PWD/$HOST
+echo "$HOST ansible_port=$SSH_PORT" > $PWD/$HOST
 
 if [[ $KEY == "" ]]; then
 	ansible-playbook $PWD/roles/keepalived.yml -e "ansible_user=$USER ansible_ssh_pass=$PASS variable_host=$HOST SYN_FLOOD=$SYN_FLOOD PROXY=$PROXY MASTER=$MASTER ETH=$ETH IP=$IP RESTART=$RESTART ADD_VRRP=$ADD_VRRP SSH_PORT=$SSH_PORT" -i $PWD/$HOST
diff --git a/app/scripts/install_nginx.sh b/app/scripts/install_nginx.sh
index b6ea929..a575b19 100644
--- a/app/scripts/install_nginx.sh
+++ b/app/scripts/install_nginx.sh
@@ -37,7 +37,7 @@ export COMMAND_WARNINGS=False
 
 PWD=`pwd`
 PWD=$PWD/scripts/ansible/
-echo $HOST > $PWD/$HOST
+echo "$HOST ansible_port=$SSH_PORT" > $PWD/$HOST
 
 if [[ $KEY == "" ]]; then
 	ansible-playbook $PWD/roles/nginx.yml -e "ansible_user=$USER ansible_ssh_pass=$PASS variable_host=$HOST PROXY=$PROXY SYN_FLOOD=$SYN_FLOOD STAT_PAGE=$STAT_PAGE STAT_PORT=$STAT_PORT STATS_USER=$STATS_USER STATS_PASS=$STATS_PASS CONFIG_PATH=$CONFIG_PATH SSH_PORT=$SSH_PORT" -i $PWD/$HOST
diff --git a/app/scripts/install_nginx_exporter.sh b/app/scripts/install_nginx_exporter.sh
index 66d63a5..29a6abf 100644
--- a/app/scripts/install_nginx_exporter.sh
+++ b/app/scripts/install_nginx_exporter.sh
@@ -35,7 +35,7 @@ export COMMAND_WARNINGS=False
 
 PWD=`pwd`
 PWD=$PWD/scripts/ansible/
-echo $HOST > $PWD/$HOST
+echo "$HOST ansible_port=$SSH_PORT" > $PWD/$HOST
 
 if [[ $KEY == "" ]]; then
 	ansible-playbook $PWD/roles/nginx_exporter.yml -e "ansible_user=$USER ansible_ssh_pass=$PASS variable_host=$HOST PROXY=$PROXY STAT_PAGE=$STAT_PAGE STAT_PORT=$STAT_PORT STATS_USER=$STATS_USER STATS_PASS=$STATS_PASS SSH_PORT=$SSH_PORT" -i $PWD/$HOST
diff --git a/app/scripts/letsencrypt.sh b/app/scripts/letsencrypt.sh
index 05c0a5f..e1d3f7b 100644
--- a/app/scripts/letsencrypt.sh
+++ b/app/scripts/letsencrypt.sh
@@ -21,9 +21,12 @@ done
 export ANSIBLE_HOST_KEY_CHECKING=False
 export ANSIBLE_DISPLAY_SKIPPED_HOSTS=False
 export ACTION_WARNINGS=False
+export LOCALHOST_WARNING=False
+export COMMAND_WARNINGS=False
+
 PWD=`pwd`
 PWD=$PWD/scripts/ansible/
-echo $HOST > $PWD/$HOST
+echo "$HOST ansible_port=$SSH_PORT" > $PWD/$HOST
 
 if [[ $KEY == "" ]]; then
 	ansible-playbook $PWD/roles/letsencrypt.yml -e "ansible_user=$USER ansible_ssh_pass=$PASS ansible_port=$SSH_PORT variable_host=$HOST PROXY=$PROXY DOMAIN=$DOMAIN EMAIL=$EMAIL SSL_PATH=$SSL_PATH" -i $PWD/$HOST