diff --git a/states/haproxy/templates/haproxy.cfg.j2 b/states/haproxy/templates/haproxy.cfg.j2 index 3802982..4413c43 100644 --- a/states/haproxy/templates/haproxy.cfg.j2 +++ b/states/haproxy/templates/haproxy.cfg.j2 @@ -147,6 +147,9 @@ cache static frontend fe_http from {{ haproxy.config.namespace }} bind *:{{ haproxy.config.http_port }},:::{{ haproxy.config.http_port }} v4v6 name http mode http + option httplog clf + option http-buffer-request + monitor-uri /dead_or_alive unique-id-format "%{+X}o %ci:%cp_%fi:%fp_%Ts_%rt:%pid" {% for name, service in haproxy.config.spoe.items() %} filter spoe engine {{ name }} config {{ haproxy.config.dir }}/spoe.cfg @@ -202,8 +205,9 @@ frontend fe_https from {{ haproxy.config.namespace }} {%- endif %} bind *:{{ haproxy.config.https_port }},:::{{ haproxy.config.https_port }} v4v6 ssl crt {{ haproxy.config.acme_fullchains_dir }}{% if haproxy.config.http2 %} alpn h2,http/1.1{% endif %} name https mode http - option httplog + option httplog clf option http-buffer-request + monitor-uri /dead_or_alive unique-id-format "%{+X}o %ci:%cp_%fi:%fp_%Ts_%rt:%pid" {% for name, service in haproxy.config.spoe.items() %} filter spoe engine {{ name }} config {{ haproxy.config.dir }}/spoe.cfg @@ -277,10 +281,6 @@ frontend fe_https from {{ haproxy.config.namespace }} use_backend %[req.hdr(User-Agent),map_beg({{ haproxy.config.dir }}/maps/ua)] if ua default_backend {{ ns.default_backend }} - monitor-uri /dead_or_alive - - log-format "%ci:%cp [%tr] %ft %b/%s %TR/%Tw/%Tc/%Tr/%Ta %ST %B %CC %CS %tsc %ac/%fc/%bc/%sc/%rc %sq/%bq %hr %hs %{+Q}r" - # HTTP Backends {%- for name, values in haproxy.config.vhosts.items() %}