Squid auth plugins. Pre/post includes moved to right places.

This commit is contained in:
bevz 2017-01-06 16:24:34 +03:00
parent 2dac5fd2b2
commit 6b14bb272d
4 changed files with 11 additions and 6 deletions

View File

@ -5,4 +5,5 @@ 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
auth.conf:/usr/local/etc/squid/auth/dummy.conf
post-auth.conf:/usr/local/etc/squid/post-auth/dummy.conf

View File

@ -0,0 +1,3 @@
# AUTOGENERATED FILE. DO NOT EDIT.
# DO NOT REMOVE THIS FILE!
# This directory is for auth config files

View File

@ -116,6 +116,9 @@ adaptation_access request_mod deny to_localhost
{% endif %}
http_access deny to_localhost
# Auth plugins
include /usr/local/etc/squid/auth/*.conf
#
# Access Permission configuration:
#

View File

@ -253,21 +253,19 @@ 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
# Pre-auth plugins
include /usr/local/etc/squid/pre-auth/*.conf
{% include "OPNsense/Proxy/squid.user.pre_auth.conf" ignore missing with context %}
{% include "OPNsense/Proxy/squid.acl.conf" ignore missing with context %}
# Post-auth plugins
include /usr/local/etc/squid/post-auth/*.conf
{% include "OPNsense/Proxy/squid.user.post_auth.conf" ignore missing with context %}
{% if helpers.exists('OPNsense.proxy.general.cache.local') %}