From d54efb70285569fef8883458af9bd74958dc8da0 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 22 Jun 2010 10:10:41 -0400
Subject: Bring the choice for nullfs to squid on 1.2.3, default to nullfs on
 NanoBSD to prevent caching and overflowing /tmp or /var. Re-enable squid on
 embedded, and bump the version.

---
 config/squid/squid.inc | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'config/squid/squid.inc')

diff --git a/config/squid/squid.inc b/config/squid/squid.inc
index 1f264a64..4f3bd034 100644
--- a/config/squid/squid.inc
+++ b/config/squid/squid.inc
@@ -676,13 +676,12 @@ EOD;
 
 
 function squid_resync_cache() {
-	global $config;
+	global $config, $g;
 
 	$settings = $config['installedpackages']['squidcache']['config'][0];
 
 	$cachedir =($settings['harddisk_cache_location'] ? $settings['harddisk_cache_location'] : '/var/squid/cache');
 	$disk_cache_size = ($settings['harddisk_cache_size'] ? $settings['harddisk_cache_size'] : 100);
-	$disk_cache_system = ($settings['harddisk_cache_system'] ? $settings['harddisk_cache_system'] : 'aufs');
 	$level1 = ($settings['level1_subdirs'] ? $settings['level1_subdirs'] : 16);
 	$memory_cache_size = ($settings['memory_cache_size'] ? $settings['memory_cache_size'] : 8);
 	$max_objsize = ($settings['maximum_object_size'] ? $settings['maximum_object_size'] : 10);
@@ -691,12 +690,28 @@ 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 (!isset($settings['harddisk_cache_system'])) {
+		if ($g['platform'] == "nanobsd") {
+			$disk_cache_system = 'null';
+		} else {
+			$disk_cache_system = 'aufs';
+		}
+	} else {
+		$disk_cache_system = $settings['harddisk_cache_system'];
+	}
+
+	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
-- 
cgit v1.2.3