aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2010-06-22 12:13:04 -0400
committerjim-p <jimp@pfsense.org>2010-06-22 12:13:04 -0400
commit91b4b904f8832c3eed7fa788594f646ca5b88569 (patch)
treef79e55100035a79c67363fd516821894d88c96bb
parent7f00a32e3e62269046c85d67d05451ef1f9c023d (diff)
downloadpfsense-packages-91b4b904f8832c3eed7fa788594f646ca5b88569.tar.gz
pfsense-packages-91b4b904f8832c3eed7fa788594f646ca5b88569.tar.bz2
pfsense-packages-91b4b904f8832c3eed7fa788594f646ca5b88569.zip
Do not initialize the cache if the null type is chosen.
-rw-r--r--config/squid/squid.inc5
1 files changed, 5 insertions, 0 deletions
diff --git a/config/squid/squid.inc b/config/squid/squid.inc
index 4f3bd034..f804ef87 100644
--- a/config/squid/squid.inc
+++ b/config/squid/squid.inc
@@ -76,6 +76,11 @@ function squid_chown_recursive($dir, $user, $group) {
function squid_dash_z() {
global $config;
$settings = $config['installedpackages']['squidcache']['config'][0];
+
+ // If the cache system is null, there is no need to initialize the (irrelevant) cache dir.
+ if ($settings['harddisk_cache_system'] == "null")
+ return;
+
$cachedir =($settings['harddisk_cache_location'] ? $settings['harddisk_cache_location'] : '/var/squid/cache');
if(!is_dir($cachedir.'/')) {