aboutsummaryrefslogtreecommitdiffstats
path: root/config/squid3
diff options
context:
space:
mode:
authordoktornotor <notordoktor@gmail.com>2015-09-30 13:29:47 +0200
committerdoktornotor <notordoktor@gmail.com>2015-09-30 13:29:47 +0200
commit49050e47642d7fbfdbd286dfec149ef74b83f179 (patch)
treed69c4b33e13a443c6ba1290230486812ecff58bd /config/squid3
parentb85616219c38868cae9840cf701d30476adc3384 (diff)
downloadpfsense-packages-49050e47642d7fbfdbd286dfec149ef74b83f179.tar.gz
pfsense-packages-49050e47642d7fbfdbd286dfec149ef74b83f179.tar.bz2
pfsense-packages-49050e47642d7fbfdbd286dfec149ef74b83f179.zip
Some additional deinstall cleanups
Diffstat (limited to 'config/squid3')
-rwxr-xr-xconfig/squid3/34/squid.inc21
1 files changed, 7 insertions, 14 deletions
diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc
index aa81a6c9..dbfcda89 100755
--- a/config/squid3/34/squid.inc
+++ b/config/squid3/34/squid.inc
@@ -394,18 +394,12 @@ function squid_deinstall_command() {
update_status("Stopping services...");
/* kill all running services */
mwexec('/usr/local/etc/rc.d/sqp_monitor.sh stop');
- if (is_process_running("c-icap")) {
- mwexec('/usr/local/etc/rc.d/c-icap stop');
- }
- if (is_process_running("clamd")) {
- mwexec('/usr/local/etc/rc.d/clamav-clamd stop');
- }
- if (is_process_running("freshclam")) {
- mwexec('/usr/local/etc/rc.d/clamav-freshclam stop');
- }
- mwexec("/bin/ps awux | /usr/bin/grep \"squid\" | /usr/bin/grep -v \"grep\" | /usr/bin/awk '{ print $2 }' | /usr/bin/xargs kill");
- mwexec("/bin/ps awux | /usr/bin/grep \"dnsserver\" | /usr/bin/grep -v \"grep\" | /usr/bin/awk '{ print $2 }' | /usr/bin/xargs kill");
- mwexec("/bin/ps awux | /usr/bin/grep \"unlinkd\" | /usr/bin/grep -v \"grep\" | /usr/bin/awk '{ print $2 }' | /usr/bin/xargs kill");
+ mwexec("/bin/ps awux | /usr/bin/grep '[c]-icap' | /usr/bin/awk '{ print $2 }' | /usr/bin/xargs kill");
+ mwexec("/bin/ps awux | /usr/bin/grep '[c]lamd' | /usr/bin/awk '{ print $2 }' | /usr/bin/xargs kill");
+ mwexec("/bin/ps awux | /usr/bin/grep '[f]reshclam' | /usr/bin/awk '{ print $2 }' | /usr/bin/xargs kill");
+ mwexec("/bin/ps awux | /usr/bin/grep '[s]quid' | /usr/bin/awk '{ print $2 }' | /usr/bin/xargs kill");
+ mwexec("/bin/ps awux | /usr/bin/grep '[d]nsserver' | /usr/bin/awk '{ print $2 }' | /usr/bin/xargs kill");
+ mwexec("/bin/ps awux | /usr/bin/grep '[u]nlinkd' | /usr/bin/awk '{ print $2 }' | /usr/bin/xargs kill");
/* delete rc scripts */
unlink_if_exists('/usr/local/etc/rc.d/sqp_monitor.sh');
unlink_if_exists('/usr/local/etc/rc.d/c-icap');
@@ -434,7 +428,7 @@ function squid_deinstall_command() {
if (is_dir("{$logdir}")) {
mwexec("/bin/rm -rf {$logdir}");
}
- $dirs = array("/var/run/c-icap", "/var/log/c-icap", "/var/log/clamav", "/var/run/clamav", "/var/db/clamav");
+ $dirs = array("/var/run/c-icap", "/var/log/c-icap", "/var/log/clamav", "/var/run/clamav", "/var/db/clamav", "/var/run/squid", "/var/squid");
foreach ($dirs as $dir) {
if (is_dir("{$dir}")) {
mwexec("/bin/rm -rf {$dir}");
@@ -454,7 +448,6 @@ function squid_deinstall_command() {
}
}
-
update_status("Reloading filter...");
filter_configure();
}