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, master has been updated via e07587fc5936abd1b33dbd4236f13d89e3640c63 (commit) from 87837787931adfe63d2011575a5131c67f44577c (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 e07587fc5936abd1b33dbd4236f13d89e3640c63 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Dec 27 00:28:26 2010 +0100

Fix squid configuration if no hdd cache should be used.

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

Summary of changes: config/rootfiles/core/44/update.sh | 1 + html/cgi-bin/proxy.cgi | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/44/update.sh b/config/rootfiles/core/44/update.sh index 40a0895..47773fb 100644 --- a/config/rootfiles/core/44/update.sh +++ b/config/rootfiles/core/44/update.sh @@ -176,6 +176,7 @@ chown nobody:nobody /var/ipfire/vpn/ipsec.conf mv /var/ipfire/proxy/squid.conf /var/ipfire/proxy/squid.conf.org grep -v "header_access " /var/ipfire/proxy/squid.conf.org | \ grep -v "error_directory " | \ +grep -v "cache_dir null" | \ grep -v "reply_body_max_size 0" > /var/ipfire/proxy/squid.conf echo >> /var/ipfire/proxy/squid.conf echo error_directory /etc/squid/errors >> /var/ipfire/proxy/squid.conf diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index a387d3e..e120fc4 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -3075,10 +3075,8 @@ cache_mem $proxysettings{'CACHE_MEM'} MB END ;

- if ($proxysettings{'CACHE_SIZE'} eq '0') + if ($proxysettings{'CACHE_SIZE'} ne '0') { - print FILE "cache_dir null /var/tmp\n\n"; - } else { print FILE "cache_dir aufs /var/log/cache $proxysettings{'CACHE_SIZE'} $proxysettings{'L1_DIRS'} 256\n\n"; }

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