diff --git a/templates/haproxy_cfg b/templates/haproxy_cfg index c87b983cf0730fe9bb42cfce96b4af34549561e2..f355dbe5a013b1dac0ee1dd2091af4ec2afb47ed 100644 --- a/templates/haproxy_cfg +++ b/templates/haproxy_cfg @@ -84,6 +84,10 @@ frontend http_in acl kibana_present hdr(host) -i -n '{{ kibana_domain|default(inventory_hostname) }}' use_backend backend_redirect_ssl if kibana_present {% endif %} +{% for host in groups['all'] %} + acl redirect_ssl_{{host}} hdr(host) -i -n -f /etc/haproxy/{{host}}.ssl.list + use_backend backend_redirect_ssl if redirect_ssl_{{host}} +{% endfor %} acl domain_uses_bigpipe hdr(host) -i -n -f /etc/haproxy/use_bigpipe.list {% if varnish_host|default(false) %} acl domain_ignores_varnish hdr(host) -i -n -f /etc/haproxy/ignore_varnish.list @@ -99,8 +103,6 @@ frontend http_in acl crm_domain_in_{{host}} hdr_dom(host) -i -n -f /etc/haproxy/{{host}}.crm.list use_backend backend_{{host}} if crm_domain_in_{{host}} {% endif %} - acl redirect_ssl_{{host}} hdr(host) -i -n -f /etc/haproxy/{{host}}.ssl.list - use_backend backend_redirect_ssl if redirect_ssl_{{host}} {% endfor %} {% for cert in proxy_certificates %} @@ -141,6 +143,10 @@ frontend https_in_{{ cert.ip }} {% for external in cert.external|default([]) %} acl is_{{ external.key }} {{ external.acl }} use_backend backend_{{ external.key }} if is_{{ external.key }} +{% endfor %} +{% for host in groups['all'] %} + acl crm_redirect_{{host}} hdr(host) -i -n -f /etc/haproxy/{{host}}.list + use_backend backend_redirect if crm_redirect_{{host}} {% endfor %} acl domain_uses_bigpipe hdr(host) -i -n -f /etc/haproxy/use_bigpipe.list {% if varnish_host|default(false) %} @@ -156,8 +162,6 @@ frontend https_in_{{ cert.ip }} acl redirect_{{host}} hdr(host) -i -n -f /etc/haproxy/{{host}}.list use_backend backend_redirect if redirect_{{host}} {% if hostvars[host].proxy_crm_domains is defined %} - acl crm_redirect_{{host}} hdr(host) -i -n -f /etc/haproxy/{{host}}.list - use_backend backend_redirect if crm_redirect_{{host}} {% endif %} {% endfor %} {% for external in cert.external|default([]) %}