caddy-frontend: Respect globality of haproxy acls

software/caddy-frontend/CHANGES.caddy_frontend.rst

@@ -20,6 +20,7 @@ Here are listed the most important changes, which might affect upgrades.
  * feature: Strict-Transport-Security aka HSTS
  * fix: use kedifa with with for file with multiple CAs
  * feature: support query string (the characters after ? in the url) in url and https-url
+ * fix: by having unique acl names fix rare bug of directing traffic to https-url instead of url or otherwise
 
 1.0.164 (2020-09-24)
 --------------------

software/caddy-frontend/buildout.hash.cfg

@@ -50,7 +50,7 @@ md5sum = a0ae858a3db8825c22d33d323392f588
 
 [template-backend-haproxy-configuration]
 _update_hash_filename_ = templates/backend-haproxy.cfg.in
-md5sum = b9b56e0018bfbfa5b6c2640f95e6f750
+md5sum = 8c4e2548a12c8fd7dba74f940201745a
 
 [template-empty]
 _update_hash_filename_ = templates/empty.in

software/caddy-frontend/templates/backend-haproxy.cfg.in

@@ -25,14 +25,14 @@ defaults
 {%-       if wildcard and host.startswith('*.') %}
 {%-         do matched.__setitem__('count', matched['count'] + 1) %}
 # match wildcard {{ host }}
-  acl is_{{ slave_instance['slave_reference'] }} hdr_reg(host) -i {{ host[2:] }}($|:.*)
+  acl is_{{ slave_instance['slave_reference'] }}_{{ scheme }} hdr_reg(host) -i {{ host[2:] }}($|:.*)
 {%-       elif not wildcard and not host.startswith('*.') %}
 {%-         do matched.__setitem__('count', matched['count'] + 1) %}
-  acl is_{{ slave_instance['slave_reference'] }} hdr_reg(host) -i ^{{ host }}($|:.*)
+  acl is_{{ slave_instance['slave_reference'] }}_{{ scheme }} hdr_reg(host) -i ^{{ host }}($|:.*)
 {%-       endif %}
 {%-     endfor %}
 {%-     if matched['count'] > 0 %}
-  use_backend {{ slave_instance['slave_reference'] }}-{{ scheme }} if is_{{ slave_instance['slave_reference'] }}
+  use_backend {{ slave_instance['slave_reference'] }}-{{ scheme }} if is_{{ slave_instance['slave_reference'] }}_{{ scheme }}
 {%-     endif %}
 {%-   endif %}
 {%- endmacro %}