From 49c7cb232870cce6986f93bb6fc3b6dbf643ec07 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 18 Jun 2013 15:59:03 +0200 Subject: [PATCH] squid: Include /etc/squid/squid.conf.pre.local. This configuration file is included _before_ the default IPFire configuration. --- config/rootfiles/core/70/filelists/files | 1 + html/cgi-bin/proxy.cgi | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/config/rootfiles/core/70/filelists/files b/config/rootfiles/core/70/filelists/files index fe925588e..683da926f 100644 --- a/config/rootfiles/core/70/filelists/files +++ b/config/rootfiles/core/70/filelists/files @@ -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 diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 901ed7250..fb313ac7c 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -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" } -- 2.39.2