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

This configuration file is included _before_ the
default IPFire configuration.

diff --git a/config/rootfiles/core/70/filelists/files b/config/rootfiles/core/70/filelists/files
index fe925588e8b34b015484c174cc64c49d62ef71c9..683da926f42457bcf940a59055fac66d4af82bd8 100644 (file)
--- 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 901ed7250466d84a2aa6a0c043a3b3745d5e6098..fb313ac7c122104c0376a0845f98fa32495d8617 100644 (file)
--- 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" }