diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/squid/squid.inc | 10 | ||||
| -rw-r--r-- | packages/squid/squid.xml | 2 |
2 files changed, 6 insertions, 6 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 --> |