aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2006-01-07 20:45:30 +0000
committerScott Ullrich <sullrich@pfsense.org>2006-01-07 20:45:30 +0000
commit2d0a47e190b43a55fa6b7815117a67cd4ad4249d (patch)
tree5ab5ac2bad59d4a6e8b5faa2ca0cd2eb43105e05
parent3059fa17f356d0d4d95d7e61debce49d79baa944 (diff)
downloadpfsense-packages-2d0a47e190b43a55fa6b7815117a67cd4ad4249d.tar.gz
pfsense-packages-2d0a47e190b43a55fa6b7815117a67cd4ad4249d.tar.bz2
pfsense-packages-2d0a47e190b43a55fa6b7815117a67cd4ad4249d.zip
mwxec -> mwexec
-rw-r--r--packages/squid_ng.xml14
1 files changed, 4 insertions, 10 deletions
diff --git a/packages/squid_ng.xml b/packages/squid_ng.xml
index 2385a215..715b90cd 100644
--- a/packages/squid_ng.xml
+++ b/packages/squid_ng.xml
@@ -382,26 +382,20 @@
</custom_php_install_command>
<custom_php_deinstall_command>
update_output_window("Stopping proxy service...");
-
- do while ((file_exists("/var/run/squid.pid") or ($i == 30)) {
- mwexec("/usr/local/sbin/squid -k shutdown");
- $i++;
- }
-
+ $i=0;
+ mwexec("/usr/local/sbin/squid -k shutdown");
+ sleep(1);
/* brute force any remaining squid processes out */
- mwxec("/usr/bin/killall squid");
-
+ mwexec("/usr/bin/killall squid");
update_output_window("Recursively removing directories hierarchies...");
update_output_window("If existant, log files in /var/squid/logs will remain...");
mwexec("rm -rf /usr/local/squid");
mwexec("rm -rf /var/squid/cache");
mwexec("rm -rf /usr/local/etc/squid");
-
update_output_window("Removing configuration files...");
unlink_if_exists("/usr/local/etc/rc.d/squid.sh");
unlink_if_exists("/usr/local/etc/squid");
unlink_if_exists("/usr/local/libexec/squid");
-
filter_configure();
</custom_php_deinstall_command>
<start_command>/usr/local/etc/rc.d/squid.sh</start_command>