diff --git a/states/haproxy/defaults.yaml b/states/haproxy/defaults.yaml index 177e2ca..84c242e 100644 --- a/states/haproxy/defaults.yaml +++ b/states/haproxy/defaults.yaml @@ -35,7 +35,7 @@ haproxy: #log: 127.0.0.1 local0 log: stdout format raw daemon info retries: 2 - timeout check: 2s + timeout check: 4s timeout client: 60m timeout connect: 2s timeout server: 60m diff --git a/states/haproxy/templates/haproxy.cfg.j2 b/states/haproxy/templates/haproxy.cfg.j2 index 6b316ff..361dbcb 100644 --- a/states/haproxy/templates/haproxy.cfg.j2 +++ b/states/haproxy/templates/haproxy.cfg.j2 @@ -173,7 +173,7 @@ frontend https from {{ haproxy.config.namespace }} http-request redirect location %[req.hdr(Host),map_dom({{ haproxy.config.dir }}/maps/redirects)] code 301 if { req.hdr(Host),map_dom({{ haproxy.config.dir }}/maps/redirects) -m found } http-request deny deny_status 404 unless domains {%- if haproxy.config.admin %} - use_backend admin if self_host internal path_root || path_admin + use_backend admin if self_host internal path_admin {%- endif %} use_backend %[req.hdr(Host),lower,map({{ haproxy.config.dir }}/maps/vhosts,nginx)] monitor-uri /dead_or_alive