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 8b417dd143a02900f8ba06510d7ffa3039f15be8 (commit) from 15f78770b1d4ee730dca39166590393e3b24a666 (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 8b417dd143a02900f8ba06510d7ffa3039f15be8 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jul 16 19:38:54 2013 +0200

proxy.cgi: Re-apply accidentially removed changes.

Removed in dfee7582f9b386126fcaa6c8cdcb98677e34f5b4, originally introduced in 49c7cb232870cce6986f93bb6fc3b6dbf643ec07.

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

Summary of changes: html/cgi-bin/proxy.cgi | 6 ++++++ 1 file changed, 6 insertions(+)

Difference in files: diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 76d52b4..870042a 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" }

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