Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

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

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" }