webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix squid configuration if no hdd cache should be used.

Browse Source
This commit is contained in:
Arne Fitzenreiter
2010-12-27 00:28:26 +01:00
parent 8783778793
commit e07587fc59
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/44/update.sh
View File

@@ -176,6 +176,7 @@ chown nobody:nobody /var/ipfire/vpn/ipsec.conf
mv /var/ipfire/proxy/squid.conf /var/ipfire/proxy/squid.conf.org mv /var/ipfire/proxy/squid.conf /var/ipfire/proxy/squid.conf.org
grep -v "header_access " /var/ipfire/proxy/squid.conf.org | \ grep -v "header_access " /var/ipfire/proxy/squid.conf.org | \
grep -v "error_directory " | \ grep -v "error_directory " | \
grep -v "cache_dir null" | \
grep -v "reply_body_max_size 0" > /var/ipfire/proxy/squid.conf grep -v "reply_body_max_size 0" > /var/ipfire/proxy/squid.conf
echo >> /var/ipfire/proxy/squid.conf echo >> /var/ipfire/proxy/squid.conf
echo error_directory /etc/squid/errors >> /var/ipfire/proxy/squid.conf echo error_directory /etc/squid/errors >> /var/ipfire/proxy/squid.conf

4
html/cgi-bin/proxy.cgi
View File

@@ -3075,10 +3075,8 @@ cache_mem $proxysettings{'CACHE_MEM'} MB
END 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"; print FILE "cache_dir aufs /var/log/cache $proxysettings{'CACHE_SIZE'} $proxysettings{'L1_DIRS'} 256\n\n";
} }