aboutsummaryrefslogtreecommitdiffstats
path: root/packages/squid3
diff options
context:
space:
mode:
authorMartin Fuchs <mfuchs@pfsense.org>2008-09-03 23:06:14 +0000
committerMartin Fuchs <mfuchs@pfsense.org>2008-09-03 23:06:14 +0000
commit2fc9cf03c1f0d5e844115e917f5f5e849aa7cd9b (patch)
tree29a8840a7b271e964d8e386493b53b8ba55017f4 /packages/squid3
parentf71bdf09e7d395c5e94d29fa4c377d2fdcb48702 (diff)
downloadpfsense-packages-2fc9cf03c1f0d5e844115e917f5f5e849aa7cd9b.tar.gz
pfsense-packages-2fc9cf03c1f0d5e844115e917f5f5e849aa7cd9b.tar.bz2
pfsense-packages-2fc9cf03c1f0d5e844115e917f5f5e849aa7cd9b.zip
added selection availability for aufs / diskd to squid gui
Diffstat (limited to 'packages/squid3')
-rw-r--r--packages/squid3/squid.inc5
-rw-r--r--packages/squid3/squid_cache.xml11
2 files changed, 14 insertions, 2 deletions
diff --git a/packages/squid3/squid.inc b/packages/squid3/squid.inc
index b0969064..d6a7b15f 100644
--- a/packages/squid3/squid.inc
+++ b/packages/squid3/squid.inc
@@ -559,7 +559,7 @@ function squid_resync_general() {
$settings = $config['installedpackages']['squid']['config'][0];
$conf = "# This file is automatically generated by pfSense\n";
- $conf = "# Do not edit manually!\n";
+ $conf = "# Do not edit manually !\n";
$port = ($settings['proxy_port'] ? $settings['proxy_port'] : 3128);
$ifaces = ($settings['active_interface'] ? $settings['active_interface'] : 'lan');
@@ -653,6 +653,7 @@ function squid_resync_cache() {
$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);
@@ -662,7 +663,7 @@ function squid_resync_cache() {
$offline_mode = ($settings['enable_offline'] == 'on' ? 'on' : 'off');
$conf = <<<EOD
-cache_dir aufs $cachedir $disk_cache_size $level1 256
+cache_dir $disk_cache_system $cachedir $disk_cache_size $level1 256
cache_mem $memory_cache_size MB
maximum_object_size $max_objsize KB
minimum_object_size $min_objsize KB
diff --git a/packages/squid3/squid_cache.xml b/packages/squid3/squid_cache.xml
index fb0b956a..6ce9c695 100644
--- a/packages/squid3/squid_cache.xml
+++ b/packages/squid3/squid_cache.xml
@@ -90,6 +90,17 @@
<default_value>100</default_value>
</field>
<field>
+ <fielddescr>Hard disk cache system</fielddescr>
+ <fieldname>harddisk_cache_system</fieldname>
+ <description>This specifies the kind of storage system to use. &lt;p&gt; &lt;b&gt; aufs &lt;/b&gt; uses POSIX-threads to avoid blocking the main Squid process on disk-I/O. (Formerly known as async-io.) &lt;p&gt; &lt;b&gt; diskd &lt;/b&gt; uses a separate process to avoid blocking the main Squid process on disk-I/O.</description>
+ <type>select</type>
+ <default_value>aufs</default_value>
+ <options>
+ <option><name>aufs</name><value>aufs</value></option>
+ <option><name>diskd</name><value>diskd</value></option>
+ </options>
+ </field>
+ <field>
<fielddescr>Hard disk cache location</fielddescr>
<fieldname>harddisk_cache_location</fieldname>
<description>This is the directory where the cache will be stored. (note: do not end with a /). If you change this location, squid needs to make a new cache, this could take a while</description>