badblocks/docker-easy-haproxy
1
0
Fork 0
Code Activity

Small adjusts on start HAProxy

Browse source
This commit is contained in:
Joao Magalhaes 2022-08-18 15:17:12 +00:00
parent e6d5842098
commit fad1615968
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
assets/scripts/haproxy-reload.sh
View file

@ -57,11 +57,10 @@ if [ -f /tmp/force-reload ]; then
fi fi
if [[ ! -z "$1" ]]; then if [[ ! -z "$1" ]]; then
echo "[CONF_CHECK] Start haproxy" echo "[CONF_CHECK] Starting haproxy..."
/usr/sbin/haproxy -W -f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid -S /var/run/haproxy.sock /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 &
fi
if [[ "$RELOAD" == "true" ]]; then elif [[ "$RELOAD" == "true" ]]; then
echo "[CONF_CHECK] Reloading..." 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) & /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 fi

1
templates/haproxy.cfg.j2
View file

@ -12,6 +12,7 @@ global
defaults defaults
log global log global
option httplog
timeout connect 3s timeout connect 3s
timeout client 10s timeout client 10s