From 07cff0c375e8c696087622b6b539c4e5fd13a696 Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Wed, 4 Jan 2012 14:53:41 +0100 Subject: based on jimp 4a4429cbcf28a631014574eaf2b93f0b41555995 --- config/squid-reverse/swapstate_check.php | 48 ++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 config/squid-reverse/swapstate_check.php diff --git a/config/squid-reverse/swapstate_check.php b/config/squid-reverse/swapstate_check.php new file mode 100644 index 00000000..ab5b11d8 --- /dev/null +++ b/config/squid-reverse/swapstate_check.php @@ -0,0 +1,48 @@ +#!/usr/local/bin/php -q + 75) || (($diskusedpct > 90) && ($swapstate_size > 1024*1024*1024))) { + mwexec_bg("/bin/rm $swapstate; /usr/local/sbin/squid -k rotate"); + log_error(gettext(sprintf("Squid swap.state file exceeded size limits. Removing and rotating. File was %d bytes, %d%% of total disk space.", $swapstate_size, $swapstate_pct))); +} +?> \ No newline at end of file -- cgit v1.2.3 From 271b4d150eb3edd08bf05eb214c13e4a45bb692e Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Wed, 4 Jan 2012 14:58:06 +0100 Subject: based on jimp 54cc1ac21a9e89a496800bb521ca7d485929cc95 --- config/squid-reverse/squid.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/squid-reverse/squid.inc b/config/squid-reverse/squid.inc index 9a951f56..9b2901e5 100644 --- a/config/squid-reverse/squid.inc +++ b/config/squid-reverse/squid.inc @@ -595,6 +595,7 @@ function squid_install_cron($should_install) { switch($should_install) { case true: if(!$is_installed) { + $cachedir =($settings['harddisk_cache_location'] ? $settings['harddisk_cache_location'] : '/var/squid/cache'); $cron_item = array(); $cron_item['task_name'] = "squid_rotate_logs"; $cron_item['minute'] = "0"; @@ -603,7 +604,7 @@ function squid_install_cron($should_install) { $cron_item['month'] = "*"; $cron_item['wday'] = "*"; $cron_item['who'] = "root"; - $cron_item['command'] = "/usr/local/sbin/squid -k rotate"; + $cron_item['command'] = "/bin/rm {$cachedir}/swap.state; /usr/local/sbin/squid -k rotate"; $config['cron']['item'][] = $cron_item; parse_config(true); write_config("Squid Log Rotation"); -- cgit v1.2.3 From 039c9391afc249461782603443f16ffba4f589cc Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Wed, 4 Jan 2012 15:38:17 +0100 Subject: sed on jimp 4a4429cbcf28a631014574eaf2b93f0b41555995 --- config/squid-reverse/squid.inc | 78 +++++++++++++++++++++++++++++------------- config/squid-reverse/squid.xml | 5 +++ 2 files changed, 59 insertions(+), 24 deletions(-) diff --git a/config/squid-reverse/squid.inc b/config/squid-reverse/squid.inc index 9b2901e5..f8fd13ba 100644 --- a/config/squid-reverse/squid.inc +++ b/config/squid-reverse/squid.inc @@ -210,6 +210,8 @@ function squid_install_command() { exec("/bin/rm /usr/local/etc/rc.d/squid"); squid_write_rcfile(); exec("chmod a+rx /usr/local/libexec/squid/dnsserver"); + if(file_exists("/usr/local/pkg/swapstate_check.php")) + exec("/bin/chmod a+x /usr/local/pkg/swapstate_check.php"); foreach (array( SQUID_CONFBASE, SQUID_ACLDIR, @@ -581,21 +583,29 @@ function squid_install_cron($should_install) { global $config, $g; if($g['booting']==true) return; - $is_installed = false; + $rotate_is_installed = false; + $swapstate_is_installed = false; + if(!$config['cron']['item']) return; + $settings = $config['installedpackages']['squidcache']['config'][0]; $x=0; + $rotate_job_id=-1; + $swapstate_job_id=-1; foreach($config['cron']['item'] as $item) { if(strstr($item['task_name'], "squid_rotate_logs")) { - $is_installed = true; - break; + + $rotate_job_id = $x; + } elseif(strstr($item['task_name'], "squid_check_swapstate")) { + $swapstate_job_id = $x; } $x++; } + $need_write = false; switch($should_install) { case true: - if(!$is_installed) { - $cachedir =($settings['harddisk_cache_location'] ? $settings['harddisk_cache_location'] : '/var/squid/cache'); + $cachedir =($settings['harddisk_cache_location'] ? $settings['harddisk_cache_location'] : '/var/squid/cache'); + if($rotate_job_id < 0) { $cron_item = array(); $cron_item['task_name'] = "squid_rotate_logs"; $cron_item['minute'] = "0"; @@ -604,25 +614,46 @@ function squid_install_cron($should_install) { $cron_item['month'] = "*"; $cron_item['wday'] = "*"; $cron_item['who'] = "root"; - $cron_item['command'] = "/bin/rm {$cachedir}/swap.state; /usr/local/sbin/squid -k rotate"; + $cron_item['command'] = "/bin/rm {$cachedir}/swap.state; /usr/local/sbin/squid -k rotate"; + $config['cron']['item'][] = $cron_item; + $need_write = true; + } + if($swapstate_job_id < 0) { + $cron_item = array(); + $cron_item['task_name'] = "squid_check_swapstate"; + $cron_item['minute'] = "*/15"; + $cron_item['hour'] = "*"; + $cron_item['mday'] = "*"; + $cron_item['month'] = "*"; + $cron_item['wday'] = "*"; + $cron_item['who'] = "root"; + $cron_item['command'] = "/usr/local/pkg/swapstate_check.php"; + $config['cron']['item'][] = $cron_item; + $need_write = true; + } + if ($need_write) { $config['cron']['item'][] = $cron_item; parse_config(true); - write_config("Squid Log Rotation"); - configure_cron(); + write_config("Adding Squid Cron Jobs"); } break; case false: - if($is_installed == true) { - if($x > 0) { - unset($config['cron']['item'][$x]); - parse_config(true); - write_config(); - } - configure_cron(); - } + if($rotate_job_id >= 0) { + unset($config['cron']['item'][$rotate_job_id]); + $need_write = true; + } + if($swapstate_job_id >= 0) { + unset($config['cron']['item'][$swapstate_job_id]); + $need_write = true; + } + if ($need_write) { + parse_config(true); + write_config("Removing Squid Cron Jobs"); + } break; } -} + configure_cron(); + } function squid_resync_general() { global $g, $config, $valid_acls; @@ -673,13 +704,12 @@ cache_store_log none EOD; - if (!empty($settings['log_rotate'])) { - $conf .= "logfile_rotate {$settings['log_rotate']}\n"; - squid_install_cron(true); - } - else { - squid_install_cron(false); - } +// Per squid docs, setting logfile_rotate to 0 is safe and causes a simple close/reopen. +// Rotating also ensures that swap.state is rewritten, so is useful even if the logs +// are not being rotated. +$rotate = empty($settings['log_rotate']) ? 0 : $settings['log_rotate']; +$conf .= "logfile_rotate {$settings['log_rotate']}\n"; +squid_install_cron(true); $conf .= <<0755 http://www.pfsense.org/packages/config/squid-reverse/squid_cache.xml + + /usr/local/pkg/ + 0755 + http://www.pfsense.org/packages/config/squid-reverse/swapstate_check.php + Proxy interface -- cgit v1.2.3 From ad11f950702f9bf9f3cd3f18f0b6a86eb4434328 Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Wed, 4 Jan 2012 16:27:04 +0100 Subject: =?UTF-8?q?When=20adding=20squid's=20rotate=20job,=20make=20it=20r?= =?UTF-8?q?m=20the=20swap.state=20file=20before=CE=ED=CE=F5=20ter'=20by=20?= =?UTF-8?q?3=20commits.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 016e675a..d715ac60 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -925,7 +925,7 @@ High performance web proxy cache with HTTP / HTTPS reverse proxy and Exchange-Web-Access Assistant. http://www.squid-cache.org/ Network - 2.7.9_1 + 2.7.9_2 Stable 2.0 fernando@netfilter.com.br seth.mos@xs4all.nl mfuchs77@googlemail.com jimp@pfsense.org diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 87336991..119f1399 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -85,7 +85,7 @@ High performance web proxy cache with HTTP / HTTPS reverse proxy and Exchange-Web-Access Assistant. http://www.squid-cache.org/ Network - 2.7.9_1 + 2.7.9_2 Stable 2.0 fernando@netfilter.com.br seth.mos@xs4all.nl mfuchs77@googlemail.com jimp@pfsense.org -- cgit v1.2.3 From 1629a1a47c0ed3594ef9a9e5ad8e529b0e18fa23 Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Wed, 4 Jan 2012 17:43:02 +0100 Subject: based on jimp's 7bfe60dd9e5670bb8bbc403784c69b1dcce8e923 --- config/squid-reverse/squid.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/squid-reverse/squid.inc b/config/squid-reverse/squid.inc index f8fd13ba..151f710c 100644 --- a/config/squid-reverse/squid.inc +++ b/config/squid-reverse/squid.inc @@ -708,7 +708,7 @@ EOD; // Rotating also ensures that swap.state is rewritten, so is useful even if the logs // are not being rotated. $rotate = empty($settings['log_rotate']) ? 0 : $settings['log_rotate']; -$conf .= "logfile_rotate {$settings['log_rotate']}\n"; +$conf .= "logfile_rotate {$rotate}\n"; squid_install_cron(true); $conf .= <<