aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2010-06-01 09:40:58 -0400
committerjim-p <jimp@pfsense.org>2010-06-01 09:40:58 -0400
commitc3ebcf19ba96d980731a05074b117d8c766b6bfd (patch)
treecaaa0ac68444a2005feee5030fc94f96c3f701b1 /config
parentce218e7d375493d9fbbc05ff2873bfadf8c0d133 (diff)
downloadpfsense-packages-c3ebcf19ba96d980731a05074b117d8c766b6bfd.tar.gz
pfsense-packages-c3ebcf19ba96d980731a05074b117d8c766b6bfd.tar.bz2
pfsense-packages-c3ebcf19ba96d980731a05074b117d8c766b6bfd.zip
Fix squid cache_dir null setting.
Diffstat (limited to 'config')
-rw-r--r--config/squid-8/squid.inc8
1 files changed, 7 insertions, 1 deletions
diff --git a/config/squid-8/squid.inc b/config/squid-8/squid.inc
index 1f264a64..36556bbd 100644
--- a/config/squid-8/squid.inc
+++ b/config/squid-8/squid.inc
@@ -691,12 +691,18 @@ function squid_resync_cache() {
$memory_policy = ($settings['memory_replacement_policy'] ? $settings['memory_replacement_policy'] : 'heap GDSF');
$offline_mode = ($settings['enable_offline'] == 'on' ? 'on' : 'off');
+ if ($disk_cache_system == "null") {
+ $disk_cache_opts = "{$disk_cache_system} /tmp";
+ } else {
+ $disk_cache_opts = "{$disk_cache_system} {$cachedir} {$disk_cache_size} {$level1} 256";
+ }
+
$conf = <<<EOD
cache_mem $memory_cache_size MB
maximum_object_size_in_memory 32 KB
memory_replacement_policy $memory_policy
cache_replacement_policy $cache_policy
-cache_dir $disk_cache_system $cachedir $disk_cache_size $level1 256
+cache_dir $disk_cache_opts
minimum_object_size $min_objsize KB
maximum_object_size $max_objsize KB
offline_mode $offline_mode