From 3ad7a0168f80bcb906eb5020f6215bb4ca90548d Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Thu, 28 Jan 2021 14:30:17 +0100
Subject: [PATCH] Support a second ACL per service in the haproxy
configuration.
---
templates/haproxy.cfg.j2 | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/templates/haproxy.cfg.j2 b/templates/haproxy.cfg.j2
index 87331c6..1a915a9 100644
--- a/templates/haproxy.cfg.j2
+++ b/templates/haproxy.cfg.j2
@@ -87,6 +87,8 @@ frontend http
{% endif %}
{% for srv in docker_swarm_haproxy_additional_services %}
acl {{ srv.acl_name }} {{ srv.acl_rule }}
+ {%if srv.acl_path_rule is defined %}acl {{ srv.acl_name }}_path {{ srv.acl_path_rule }}{% endif %}
+
{% if srv.allowed_networks is defined %}
acl {{ srv.acl_name }}_nets src {% for net in srv.allowed_networks %} {{ net }}{% endfor %}
@@ -98,7 +100,8 @@ frontend http
use_backend portainer_bck if portainer_srv
{% endif %}
{% for srv in docker_swarm_haproxy_additional_services %}
- use_backend {{ srv.acl_name }}_bck if {{ srv.acl_name }}
+ use_backend {{ srv.acl_name }}_bck if {{ srv.acl_name }} {%if srv.acl_path_rule is defined %}{{ srv.acl_name }}_path{% endif %}
+
{% endfor %}
{% if docker_swarm_expose_api_via_haproxy %}