From 88ec157ed5c3e59678c54c1f1c7d73fb50c6d968 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Mon, 26 Oct 2009 19:45:20 -0400 Subject: Fix path, add comment about the code above not working --- config/squid/squid.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/squid/squid.inc b/config/squid/squid.inc index f4c16925..5419034e 100644 --- a/config/squid/squid.inc +++ b/config/squid/squid.inc @@ -257,7 +257,8 @@ function squid_deinstall_command() { $logdir = ($settings['log_dir'] ? $settings['log_dir'] : '/var/squid/log'); mwexec('rm -rf $cachedir'); mwexec('rm -rf $logdir'); - if(is_file("/var/squid/swap.state")) + // This should not be necessary but the above seems to not work!? + if(is_file("/var/squid/cache/swap.state")) mwexec("rm -rf /var/squid/cache/swap.state"); mwexec('rm -f /usr/local/etc/rc.d/proxy_monitor.sh'); mwexec("ps awux | grep \"proxy_monitor\" | grep -v \"grep\" | grep -v \"php\" | awk '{ print $2 }' | xargs kill"); -- cgit v1.2.3