From 2dac5fd2b284d12f83efd8b1d1bb44c840277d3c Mon Sep 17 00:00:00 2001 From: bevz Date: Fri, 6 Jan 2017 12:28:36 +0300 Subject: [PATCH] Squid plugins --- src/opnsense/service/templates/OPNsense/Proxy/+TARGETS | 2 ++ .../service/templates/OPNsense/Proxy/post-auth.conf | 3 +++ src/opnsense/service/templates/OPNsense/Proxy/pre-auth.conf | 4 ++++ src/opnsense/service/templates/OPNsense/Proxy/squid.conf | 6 ++++++ 4 files changed, 15 insertions(+) create mode 100644 src/opnsense/service/templates/OPNsense/Proxy/post-auth.conf create mode 100644 src/opnsense/service/templates/OPNsense/Proxy/pre-auth.conf diff --git a/src/opnsense/service/templates/OPNsense/Proxy/+TARGETS b/src/opnsense/service/templates/OPNsense/Proxy/+TARGETS index f6bdf3ac5..850e93ab4 100644 --- a/src/opnsense/service/templates/OPNsense/Proxy/+TARGETS +++ b/src/opnsense/service/templates/OPNsense/Proxy/+TARGETS @@ -4,3 +4,5 @@ newsyslog.conf:/etc/newsyslog.conf.d/squid externalACLs.conf:/usr/local/etc/squid/externalACLs.conf nobumpsites.acl:/usr/local/etc/squid/nobumpsites.acl ca.pem.id:/usr/local/etc/squid/ca.pem.id +pre-auth.conf:/usr/local/etc/squid/pre-auth/dummy.conf +post-auth.conf:/usr/local/etc/squid/post-auth/dummy.conf diff --git a/src/opnsense/service/templates/OPNsense/Proxy/post-auth.conf b/src/opnsense/service/templates/OPNsense/Proxy/post-auth.conf new file mode 100644 index 000000000..5b91051e9 --- /dev/null +++ b/src/opnsense/service/templates/OPNsense/Proxy/post-auth.conf @@ -0,0 +1,3 @@ +# AUTOGENERATED FILE. DO NOT EDIT. +# DO NOT REMOVE THIS FILE! +# This directory is for post-auth config files diff --git a/src/opnsense/service/templates/OPNsense/Proxy/pre-auth.conf b/src/opnsense/service/templates/OPNsense/Proxy/pre-auth.conf new file mode 100644 index 000000000..e0dd5904d --- /dev/null +++ b/src/opnsense/service/templates/OPNsense/Proxy/pre-auth.conf @@ -0,0 +1,4 @@ +# AUTOGENERATED FILE. DO NOT EDIT. +# DO NOT REMOVE THIS FILE! +# This directory is for pre-auth config files + diff --git a/src/opnsense/service/templates/OPNsense/Proxy/squid.conf b/src/opnsense/service/templates/OPNsense/Proxy/squid.conf index 98c825d92..c5700c3c6 100644 --- a/src/opnsense/service/templates/OPNsense/Proxy/squid.conf +++ b/src/opnsense/service/templates/OPNsense/Proxy/squid.conf @@ -253,11 +253,17 @@ icap_service request_mod reqmod_precache {{OPNsense.proxy.forward.icap.RequestUR icap_enable off {% endif %} +# Pre-auth plugins +include /usr/local/etc/squid/pre-auth/*.conf + # Authentication Settings {% if helpers.exists('OPNsense.proxy.forward.authentication.method') and OPNsense.proxy.forward.authentication.method != '' %} {% include ['OPNsense/Proxy/squid.user.alt_auth.conf', 'OPNsense/Proxy/squid.user.local_auth.conf'] %} {% endif %} +# Post-auth plugins +include /usr/local/etc/squid/post-auth/*.conf + {% include "OPNsense/Proxy/squid.user.pre_auth.conf" ignore missing with context %} {% include "OPNsense/Proxy/squid.acl.conf" ignore missing with context %}