SUNET/net-ops
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Test if we can consolidate macros

Browse source
This commit is contained in:
Johan Wassberg 2025-05-19 12:14:25 +02:00
parent c71d582b22
commit 2d5dd7a0a4
Signed by: jocar
GPG key ID: BE4EC2EEADF2C31B
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lb-test-common/overlay/opt/frontend/config/authtest/haproxy.j2
View file

@ -2,15 +2,9 @@
{% from "common/haproxy_macros.j2" import bind_ip_tls, web_security_options, acme_challenge, csp %}
{%- macro bind_ip_tls_extra(bind_ips, port, tls_cert, extra) -%}
{%- for ip in bind_ips %}
bind {{ ip }}:{{ port }} ssl crt {{ tls_cert }} {{ extra }}
{%- endfor %}
{%- endmacro %}
{% block frontend %}
frontend {{ site_name }}
{{ bind_ip_tls_extra(bind_ips, 443, tls_certificate_bundle, "verify optional crt-ignore-err all ca-file /etc/ssl/certs/ca-certificates.crt") }}
{{ bind_ip_tls (bind_ips, 443, tls_certificate_bundle, "verify optional crt-ignore-err all ca-file /etc/ssl/certs/ca-certificates.crt") }}
timeout http-request 10s

4
lb-test-common/overlay/opt/frontend/config/common/haproxy_macros.j2
View file

@ -2,9 +2,9 @@
# Macros
#
{%- macro bind_ip_tls(bind_ips, port, tls_cert) -%}
{%- macro bind_ip_tls(bind_ips, port, tls_cert, extra='') -%}
{%- for ip in bind_ips %}
bind {{ ip }}:{{ port }} ssl crt {{ tls_cert }}
bind {{ ip }}:{{ port }} ssl crt {{ tls_cert }} {{ extra }}
{%- endfor %}
{%- endmacro %}