uumas/ansible-general
1
0
Fork 0
Code Issues 5 Pull Requests Projects Releases Wiki Activity

vhost: fix defaults for matchers

Browse Source
This commit is contained in:
uumas
2025-11-22 05:55:56 +02:00
parent d8bd645a80
commit c151a2ee0c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
roles/vhost/templates/Caddyfile_block.j2
View File

@@ -7,13 +7,13 @@
{% else %} {% else %}
handle { handle {
{% endif %} {% endif %}
{% for matcher in location.matchers %} {% for matcher in location.matchers %}
{% if matcher.name != '' %} {% if matcher.name != '' %}
@{{ matcher.name }} { @{{ matcher.name }} {
{% if matcher.match_methods | length > 0 %} {% if matcher.match_methods | default([]) | length > 0 %}
method {{ matcher.match_methods | join(' ') }} method {{ matcher.match_methods | join(' ') }}
{% endif %} {% endif %}
{% for header in matcher.match_headers | dict2items %} {% for header in matcher.match_headers | default({}) | dict2items %}
header{{ '_regexp' if header.value.startswith('^') and header.value.endswith('$') else '' }} {{ header.key }} {{ header.value }} header{{ '_regexp' if header.value.startswith('^') and header.value.endswith('$') else '' }} {{ header.key }} {{ header.value }}
{% endfor %} {% endfor %}
} }
@@ -79,7 +79,7 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
} }
{% endfor %} {% endfor %}
} }
{% endfor %} {% endfor %}
} }

2
roles/vhost/vars/main.yaml
View File

@@ -1,7 +1,7 @@
--- ---
_vhost_matcher_defaults: _vhost_matcher_defaults:
match_headers: {} match_headers: {}
match_method: [] match_methods: []
_vhost_matchers: >- _vhost_matchers: >-
{{ {{
vhost_matchers vhost_matchers