diff options
author | Christian Breunig <christian@breunig.cc> | 2025-02-24 18:54:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-02-24 18:54:56 +0100 |
commit | fe08f7f3a6bc48b190727105ea6172af06444bdf (patch) | |
tree | e4b1bcb1e143da4679273c35d5bb868d95bd46a1 /data/templates/load-balancing | |
parent | 7aa82226e3bcc15ed957a8bed6c2fba25da35525 (diff) | |
parent | fe20eae99ebdb7781f74ada3a7c13a848ea75bcc (diff) | |
download | vyos-1x-fe08f7f3a6bc48b190727105ea6172af06444bdf.tar.gz vyos-1x-fe08f7f3a6bc48b190727105ea6172af06444bdf.zip |
Merge pull request #4360 from sever-sever/T7190
T7190: Add haproxy default timeout options configurable
Diffstat (limited to 'data/templates/load-balancing')
-rw-r--r-- | data/templates/load-balancing/haproxy.cfg.j2 | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/data/templates/load-balancing/haproxy.cfg.j2 b/data/templates/load-balancing/haproxy.cfg.j2 index c98b739e2..70ea5d2b0 100644 --- a/data/templates/load-balancing/haproxy.cfg.j2 +++ b/data/templates/load-balancing/haproxy.cfg.j2 @@ -38,9 +38,10 @@ defaults log global mode http option dontlognull - timeout connect 10s - timeout client 50s - timeout server 50s + timeout check {{ timeout.check }}s + timeout connect {{ timeout.connect }}s + timeout client {{ timeout.client }}s + timeout server {{ timeout.server }}s errorfile 400 /etc/haproxy/errors/400.http errorfile 403 /etc/haproxy/errors/403.http errorfile 408 /etc/haproxy/errors/408.http @@ -134,6 +135,11 @@ frontend {{ front }} default_backend {{ backend }} {% endfor %} {% endif %} +{% if front_config.timeout is vyos_defined %} +{% if front_config.timeout.client is vyos_defined %} + timeout client {{ front_config.timeout.client }}s +{% endif %} +{% endif %} {% endfor %} {% endif %} |