From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 18 Jul 2012 11:04:49 +0000 (+0200)
Subject: proxy.cgi: Add option to add own configuration settings.
X-Git-Tag: v2.11-core61^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb3b93ccb5788ddf4388bbc559810980fcaca1d8;p=people%2Fms%2Fipfire-2.x.git

proxy.cgi: Add option to add own configuration settings.
---

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 6f4aed27a2..015502a4e5 100755
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -3930,6 +3930,11 @@ END
 		print FILE "url_rewrite_program /usr/sbin/redirect_wrapper\n";
 		print FILE "url_rewrite_children $proxysettings{'CHILDREN'}\n\n";
 	}
+
+	# Include file with user defined settings.
+	if (-e "/etc/squid/squid.conf.local") {
+		print FILE "include /etc/squid/squid.conf.local\n";
+	}
 	close FILE;
 }