diff options
| author | Seth Mos <seth.mos@xs4all.nl> | 2007-01-09 13:37:26 +0000 |
|---|---|---|
| committer | Seth Mos <seth.mos@xs4all.nl> | 2007-01-09 13:37:26 +0000 |
| commit | 8eda4358b30ca355395f23566c568dac920bf2f3 (patch) | |
| tree | 114c47b886de2cab9e3817a204ee7ddf67a23573 | |
| parent | f0840732be28dd30565f11be4ff96b8f6c219b85 (diff) | |
| download | pfsense-packages-8eda4358b30ca355395f23566c568dac920bf2f3.tar.gz pfsense-packages-8eda4358b30ca355395f23566c568dac920bf2f3.tar.bz2 pfsense-packages-8eda4358b30ca355395f23566c568dac920bf2f3.zip | |
Bump Squid version.
hoping to silence the double startup error.
| -rw-r--r-- | packages/squid/squid.inc | 10 | ||||
| -rw-r--r-- | packages/squid/squid.xml | 2 | ||||
| -rw-r--r-- | pkg_config.xml | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/packages/squid/squid.inc b/packages/squid/squid.inc index f531b286..f2ce1a3c 100644 --- a/packages/squid/squid.inc +++ b/packages/squid/squid.inc @@ -42,7 +42,6 @@ define('SQUID_PASSWD', '/var/etc/squid.passwd'); $valid_acls = array(); - function squid_get_real_interface_address($iface) { global $config; @@ -139,16 +138,13 @@ EOD; log_error("Stopping any running proxy monitors"); mwexec("ps awux | grep \"proxy_monitor\" | grep -v \"grep\" | grep -v \"php\" | awk '{ print $2 }' | xargs kill"); sleep(1); - /* restart proxy alarm scripts */ - log_error("Starting a proxy monitor script"); - mwexec_bg("/usr/local/etc/rc.d/proxy_monitor.sh"); if (!file_exists(SQUID_CONFBASE . '/mime.conf') && file_exists(SQUID_CONFBASE . '/mime.conf.default')) copy(SQUID_CONFBASE . '/mime.conf.default', SQUID_CONFBASE . '/mime.conf'); squid_dash_z(); - if (!is_service_running('squid')) { + if (!isset(is_service_running('squid'))) { log_error("Starting Squid"); mwexec_bg("/usr/local/sbin/squid -D"); } else { @@ -156,6 +152,10 @@ EOD; mwexec("/usr/local/sbin/squid -k reconfigure"); } + /* restart proxy alarm scripts */ + log_error("Starting a proxy monitor script"); + mwexec_bg("/usr/local/etc/rc.d/proxy_monitor.sh"); + filter_configure(); } diff --git a/packages/squid/squid.xml b/packages/squid/squid.xml index 5cef1d63..5d44ade0 100644 --- a/packages/squid/squid.xml +++ b/packages/squid/squid.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packagegui> <name>squid</name> - <version>2.6.5_1-p6</version> + <version>2.6.5_1-p7</version> <include_file>/usr/local/pkg/squid.inc</include_file> <!-- Installation --> diff --git a/pkg_config.xml b/pkg_config.xml index 725e94ae..37eeb44c 100644 --- a/pkg_config.xml +++ b/pkg_config.xml @@ -500,7 +500,7 @@ <descr>High performance web proxy cache.</descr> <website>http://www.squid-cache.org/</website> <category>Network</category> - <version>2.6.5_1-p6</version> + <version>2.6.5_1-p7</version> <status>BETA</status> <required_version>1.0</required_version> <maintainer>fernando@netfilter.com.br seth.mos@xs4all.nl</maintainer> |