From: Arne Fitzenreiter Date: Sun, 13 Jan 2013 21:46:49 +0000 (+0100) Subject: proxy: fix cache_replacement_policy setting. X-Git-Tag: v2.13-beta2~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7b7cbae360dc4406e14faddd4cd1d1dac0495b2;p=people%2Fms%2Fipfire-2.x.git proxy: fix cache_replacement_policy setting. fixes: 10264 thx to SAHC for help. --- diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 991d69109b..c3997cf18a 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -3086,12 +3086,6 @@ pid_filename /var/run/squid.pid cache_mem $proxysettings{'CACHE_MEM'} MB END ; - - if ($proxysettings{'CACHE_SIZE'} ne '0') - { - print FILE "cache_dir aufs /var/log/cache $proxysettings{'CACHE_SIZE'} $proxysettings{'L1_DIRS'} 256\n\n"; - } - print FILE "error_directory $errordir/$proxysettings{'ERR_LANGUAGE'}\n\n"; if ($proxysettings{'OFFLINE_MODE'} eq 'on') { print FILE "offline_mode on\n\n"; } @@ -3109,6 +3103,11 @@ END print FILE "\n"; } + if ($proxysettings{'CACHE_SIZE'} ne '0') + { + print FILE "cache_dir aufs /var/log/cache $proxysettings{'CACHE_SIZE'} $proxysettings{'L1_DIRS'} 256\n\n"; + } + if ($proxysettings{'LOGGING'} eq 'on') { print FILE <