diff options
| -rw-r--r-- | packages/squid/squid.inc | 5 | ||||
| -rw-r--r-- | packages/squid/squid_cache.xml | 11 | ||||
| -rw-r--r-- | packages/squid3/squid.inc | 5 | ||||
| -rw-r--r-- | packages/squid3/squid_cache.xml | 11 | ||||
| -rw-r--r-- | pkg_config.7.xml | 4 | ||||
| -rw-r--r-- | pkg_config.xml | 2 |
6 files changed, 31 insertions, 7 deletions
diff --git a/packages/squid/squid.inc b/packages/squid/squid.inc index fa8090f0..6fad6b7e 100644 --- a/packages/squid/squid.inc +++ b/packages/squid/squid.inc @@ -558,7 +558,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'); @@ -652,6 +652,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); @@ -661,7 +662,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/squid/squid_cache.xml b/packages/squid/squid_cache.xml index fb0b956a..6ce9c695 100644 --- a/packages/squid/squid_cache.xml +++ b/packages/squid/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. <p> <b> aufs </b> uses POSIX-threads to avoid blocking the main Squid process on disk-I/O. (Formerly known as async-io.) <p> <b> diskd </b> 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> 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. <p> <b> aufs </b> uses POSIX-threads to avoid blocking the main Squid process on disk-I/O. (Formerly known as async-io.) <p> <b> diskd </b> 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> diff --git a/pkg_config.7.xml b/pkg_config.7.xml index dd6befbc..18ab4083 100644 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -282,7 +282,7 @@ <descr>High performance web proxy cache.</descr> <website>http://www.squid-cache.org/</website> <category>Network</category> - <version>2.6.21_04</version> + <version>2.6.21_05</version> <status>Stable</status> <required_version>1.2.1</required_version> <maintainer>fernando@netfilter.com.br seth.mos@xs4all.nl mfuchs77@googlemail.com</maintainer> @@ -298,7 +298,7 @@ <descr>EXPERIMANTAL! Not all directives are ported yet! High performance web proxy cache.</descr> <website>http://www.squid-cache.org/</website> <category>Network</category> - <version>3.0.8_03</version> + <version>3.0.8_04</version> <status>ALPHA</status> <required_version>1.2.1</required_version> <maintainer>fernando@netfilter.com.br seth.mos@xs4all.nl mfuchs77@googlemail.com</maintainer> diff --git a/pkg_config.xml b/pkg_config.xml index 2844cc21..54c60ced 100644 --- a/pkg_config.xml +++ b/pkg_config.xml @@ -507,7 +507,7 @@ <descr>High performance web proxy cache.</descr> <website>http://www.squid-cache.org/</website> <category>Network</category> - <version>2.6.18.1_04</version> + <version>2.6.18.1_05</version> <status>Stable</status> <required_version>1.0</required_version> <maintainer>fernando@netfilter.com.br seth.mos@xs4all.nl mfuchs77@googlemail.com</maintainer> |