paulbsd/paulbsd-salt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated haproxy state
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Paul 2024-07-08 17:17:04 +02:00
parent 26d56364d0
commit d229e8c728
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
states/haproxy/defaults.yaml
View File

@ -83,7 +83,6 @@ haproxy:
timeout client: 60m timeout client: 60m
timeout connect: 2s timeout connect: 2s
timeout server: 60m timeout server: 60m
#unique-id-format: "%{+X}o\\ %ci:%cp_%fi:%fp_%Ts_%rt:%pid"
balance: roundrobin balance: roundrobin
check: true check: true
http_port: 80 http_port: 80

6
states/haproxy/templates/haproxy.cfg.j2
View File

@ -146,6 +146,7 @@ cache static
frontend fe_http from {{ haproxy.config.namespace }} frontend fe_http from {{ haproxy.config.namespace }}
bind *:{{ haproxy.config.http_port }},:::{{ haproxy.config.http_port }} v4v6 name http bind *:{{ haproxy.config.http_port }},:::{{ haproxy.config.http_port }} v4v6 name http
mode http mode http
unique-id "%{+X}o\\ %ci:%cp_%fi:%fp_%Ts_%rt:%pid"
{% for name, service in haproxy.config.spoe.items() %} {% for name, service in haproxy.config.spoe.items() %}
filter spoe engine {{ name }} config {{ haproxy.config.dir }}/spoe.cfg filter spoe engine {{ name }} config {{ haproxy.config.dir }}/spoe.cfg
{%- endfor %} {%- endfor %}
@ -184,15 +185,16 @@ frontend fe_http from {{ haproxy.config.namespace }}
# Default HTTPS frontend # Default HTTPS frontend
frontend fe_https from {{ haproxy.config.namespace }} frontend fe_https from {{ haproxy.config.namespace }}
{% if haproxy.config.quic|default(true) %} {%- if haproxy.config.quic|default(true) %}
.if feature(QUIC) .if feature(QUIC)
bind quic4@*:{{ haproxy.config.https_port }},quic6@:::{{ haproxy.config.https_port }} v4v6 ssl crt {{ haproxy.config.acme_fullchains_dir }}{% if haproxy.config.http2 %} alpn h3,h2,http/1.1{% endif %} name https bind quic4@*:{{ haproxy.config.https_port }},quic6@:::{{ haproxy.config.https_port }} v4v6 ssl crt {{ haproxy.config.acme_fullchains_dir }}{% if haproxy.config.http2 %} alpn h3,h2,http/1.1{% endif %} name https
.endif .endif
{% endif %} {%- 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 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 mode http
option httplog option httplog
option http-buffer-request option http-buffer-request
unique-id "%{+X}o\\ %ci:%cp_%fi:%fp_%Ts_%rt:%pid"
{% for name, service in haproxy.config.spoe.items() %} {% for name, service in haproxy.config.spoe.items() %}
filter spoe engine {{ name }} config {{ haproxy.config.dir }}/spoe.cfg filter spoe engine {{ name }} config {{ haproxy.config.dir }}/spoe.cfg
{%- endfor %} {%- endfor %}