From 8a0a35e82a1bbaceff15340e8706b79bca6df72f Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Tue, 1 Mar 2016 20:06:40 +0100 Subject: [PATCH] (proxy) stack remote acl's --- .../service/templates/OPNsense/Proxy/squid.conf | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/opnsense/service/templates/OPNsense/Proxy/squid.conf b/src/opnsense/service/templates/OPNsense/Proxy/squid.conf index ff9ffc54b..4479eec8f 100644 --- a/src/opnsense/service/templates/OPNsense/Proxy/squid.conf +++ b/src/opnsense/service/templates/OPNsense/Proxy/squid.conf @@ -128,7 +128,7 @@ acl blackList url_regex {{element|replace(".","\.")}} {% if helpers.exists('OPNsense.proxy.forward.acl.remoteACLs.blacklists') %} {% for blacklist in helpers.toList('OPNsense.proxy.forward.acl.remoteACLs.blacklists.blacklist') %} {% if blacklist.enabled=='1' %} -acl remoteblacklist dstdomain "/usr/local/etc/squid/acl/{{blacklist.filename}}" +acl remoteblacklist_{{blacklist.filename}} dstdomain "/usr/local/etc/squid/acl/{{blacklist.filename}}" {% endif %} {% endfor %} {% endif %} @@ -264,14 +264,12 @@ http_access deny blackList {% if helpers.exists('OPNsense.proxy.forward.acl.remoteACLs.blacklists') %} {% for blacklist in helpers.toList('OPNsense.proxy.forward.acl.remoteACLs.blacklists.blacklist') if blacklist.enabled=='1' %} -{% if loop.first %} -# ACL list (Deny) remoteblacklist +# ACL list (Deny) remoteblacklist_{{blacklist.filename}} {% if helpers.exists('OPNsense.proxy.forward.icap.enable') and OPNsense.proxy.forward.icap.enable == '1' %} -adaptation_access response_mod deny remoteblacklist -adaptation_access request_mod deny remoteblacklist -{% endif %} -http_access deny remoteblacklist +adaptation_access response_mod deny remoteblacklist_{{blacklist.filename}} +adaptation_access request_mod deny remoteblacklist_{{blacklist.filename}} {% endif %} +http_access deny remoteblacklist_{{blacklist.filename}} {% endfor %} {% endif %}