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 40a0895cad214979ab2cdceee1b8d7514d712a1b..47773fbc5587a98bf049e88e7bd42d68ae7f1574 100644 (file)
--- 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 a387d3e75f8b7042dc4c6bd195608995b7802557..e120fc402f51a68a4ffe8563c9dddafccec0e4d9 100644 (file)
--- 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";
        }