Merge branch 'current' of https://github.com/vyos/vyos-1x into current

1 files changed, 18 insertions, 18 deletions

diff --git a/data/templates/squid/sg_acl.conf.tmpl b/data/templates/squid/sg_acl.conf.tmpl
index cb1c3ccb0..ce72b173a 100644
--- a/data/templates/squid/sg_acl.conf.tmpl
+++ b/data/templates/squid/sg_acl.conf.tmpl
@@ -1,18 +1,18 @@
-### generated by service_webproxy.py ###

-dbhome {{ squidguard_db_dir }}

-

-dest {{ category }}-{{ rule }} {

-{% if list_type == 'domains' %}

-    domainlist      {{ category }}/domains

-{% elif list_type == 'urls' %}

-    urllist         {{ category }}/urls

-{% elif list_type == 'expressions' %}

-    expressionlist  {{ category }}/expressions

-{% endif %}

-}

-

-acl {

-    default {

-        pass all

-    }

-}

+### generated by service_webproxy.py ###
+dbhome {{ squidguard_db_dir }}
+
+dest {{ category }}-{{ rule }} {
+{% if list_type == 'domains' %}
+    domainlist      {{ category }}/domains
+{% elif list_type == 'urls' %}
+    urllist         {{ category }}/urls
+{% elif list_type == 'expressions' %}
+    expressionlist  {{ category }}/expressions
+{% endif %}
+}
+
+acl {
+    default {
+        pass all
+    }
+}