From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 16 Jul 2013 17:38:54 +0000 (+0200)
Subject: proxy.cgi: Re-apply accidentially removed changes.
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=8b417dd143a02900f8ba06510d7ffa3039f15be8

proxy.cgi: Re-apply accidentially removed changes.

Removed in dfee7582f9b386126fcaa6c8cdcb98677e34f5b4,
originally introduced in 49c7cb232870cce6986f93bb6fc3b6dbf643ec07.
---

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 76d52b425..870042ae5 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -3071,6 +3071,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" }