[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 49c7cb232870cce6986f93bb6fc3b6dbf643ec07

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 49c7cb232870cce6986f93bb6fc3b6dbf643ec07

[git]

[-- Attachment #1: Type: text/plain, Size: 2346 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  49c7cb232870cce6986f93bb6fc3b6dbf643ec07 (commit)
      from  d0196acc90145f8e8831a89bc32e4f86a02c7eb6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 49c7cb232870cce6986f93bb6fc3b6dbf643ec07
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Jun 18 15:59:03 2013 +0200

    squid: Include /etc/squid/squid.conf.pre.local.
    
    This configuration file is included _before_ the
    default IPFire configuration.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/70/filelists/files | 1 +
 html/cgi-bin/proxy.cgi                   | 6 ++++++
 2 files changed, 7 insertions(+)

Difference in files:
diff --git a/config/rootfiles/core/70/filelists/files b/config/rootfiles/core/70/filelists/files
index fe92558..683da92 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 901ed72..fb313ac 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" }


hooks/post-receive
--
IPFire 2.x development tree