squid: Include /etc/squid/squid.conf.pre.local.

This configuration file is included _before_ the
default IPFire configuration.
This commit is contained in:
Michael Tremer
2013-06-18 15:59:03 +02:00
parent d0196acc90
commit 49c7cb2328
2 changed files with 7 additions and 0 deletions

View File

@@ -5,6 +5,7 @@ etc/rc.d/init.d/squid
usr/local/bin/openvpnctrl
etc/init.d/firewall
srv/web/ipfire/cgi-bin/ddns.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
usr/lib/squid/errors/tr/ERR_ACCESS_DENIED
usr/lib/squid/errors/tr/ERR_ACL_TIME_QUOTA_EXCEEDED
usr/lib/squid/errors/tr/ERR_AGENT_CONFIGURE

View File

@@ -3061,6 +3061,12 @@ icp_port 0
END
;
# Include file with user defined settings.
if (-e "/etc/squid/squid.conf.pre.local") {
print FILE "include /etc/squid/squid.conf.pre.local\n\n";
}
print FILE "http_port $netsettings{'GREEN_ADDRESS'}:$proxysettings{'PROXY_PORT'}";
if ($proxysettings{'TRANSPARENT'} eq 'on') { print FILE " transparent" }
if ($proxysettings{'NO_CONNECTION_AUTH'} eq 'on') { print FILE " no-connection-auth" }