From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 26 Dec 2010 23:28:26 +0000 (+0100)
Subject: Fix squid configuration if no hdd cache should be used.
X-Git-Tag: v2.9-rc1~31
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=e07587fc5936abd1b33dbd4236f13d89e3640c63

Fix squid configuration if no hdd cache should be used.
---

diff --git a/config/rootfiles/core/44/update.sh b/config/rootfiles/core/44/update.sh
index 40a0895cad..47773fbc55 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 a387d3e75f..e120fc402f 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";
 	}