From fad161596887a53d4ef077288e068ada0528b3ed Mon Sep 17 00:00:00 2001 From: Joao Magalhaes Date: Thu, 18 Aug 2022 15:17:12 +0000 Subject: [PATCH] Small adjusts on start HAProxy --- assets/scripts/haproxy-reload.sh | 7 +++---- templates/haproxy.cfg.j2 | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/scripts/haproxy-reload.sh b/assets/scripts/haproxy-reload.sh index 6943425..5a3980f 100755 --- a/assets/scripts/haproxy-reload.sh +++ b/assets/scripts/haproxy-reload.sh @@ -57,11 +57,10 @@ if [ -f /tmp/force-reload ]; then fi if [[ ! -z "$1" ]]; then - echo "[CONF_CHECK] Start haproxy" - /usr/sbin/haproxy -W -f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid -S /var/run/haproxy.sock -fi + echo "[CONF_CHECK] Starting haproxy..." + /usr/sbin/haproxy -W -f /etc/haproxy/haproxy.cfg $(ls /etc/haproxy/conf.d/*.cfg 2>/dev/null | xargs -I{} echo -f {}) -p /run/haproxy.pid -S /var/run/haproxy.sock & -if [[ "$RELOAD" == "true" ]]; then +elif [[ "$RELOAD" == "true" ]]; then echo "[CONF_CHECK] Reloading..." /usr/sbin/haproxy -W -f /etc/haproxy/haproxy.cfg $(ls /etc/haproxy/conf.d/*.cfg 2>/dev/null | xargs -I{} echo -f {}) -p /run/haproxy.pid -x /var/run/haproxy.sock -sf $(cat /run/haproxy.pid) & fi diff --git a/templates/haproxy.cfg.j2 b/templates/haproxy.cfg.j2 index 6e183de..eda4b8a 100644 --- a/templates/haproxy.cfg.j2 +++ b/templates/haproxy.cfg.j2 @@ -12,6 +12,7 @@ global defaults log global + option httplog timeout connect 3s timeout client 10s @@ -76,4 +77,4 @@ backend srv_{{ host }} backend letsencrypt_backend mode http - server certbot 127.0.0.1:2080 \ No newline at end of file + server certbot 127.0.0.1:2080