aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2010-12-29 11:07:41 +0000
committerErmal <eri@pfsense.org>2010-12-29 11:07:41 +0000
commitd4c84dfdbad19306d1ef2827fcb4fc436b908106 (patch)
tree4c10f7cbf4b6accbe2ec6585b10f20341dadccc1
parent76aab977b8cd6b7cf7b24a018cdd5107956f5109 (diff)
downloadpfsense-packages-d4c84dfdbad19306d1ef2827fcb4fc436b908106.tar.gz
pfsense-packages-d4c84dfdbad19306d1ef2827fcb4fc436b908106.tar.bz2
pfsense-packages-d4c84dfdbad19306d1ef2827fcb4fc436b908106.zip
Do not call filter_configure_sync directly since this is not best practice
Diffstat
-rw-r--r--config/squid-head/squid_monitor.sh4
-rw-r--r--config/squid-reverse/proxy_monitor.sh8
-rw-r--r--config/squid-reverse/squid.inc2
-rw-r--r--config/squid/proxy_monitor.sh8
-rw-r--r--config/squid/squid.inc2
-rw-r--r--config/squid3/proxy_monitor.sh8
-rw-r--r--config/squid3/squid.inc2
7 files changed, 17 insertions, 17 deletions
diff --git a/config/squid-head/squid_monitor.sh b/config/squid-head/squid_monitor.sh
index d0035d1a..c821ae4c 100644
--- a/config/squid-head/squid_monitor.sh
+++ b/config/squid-head/squid_monitor.sh
@@ -47,7 +47,7 @@ while [ /bin/true ]; do
/usr/local/etc/rc.d/squid.sh start
sleep 3
echo "Reconfiguring filter..." | logger -p daemon.info -i -t Squid_Alarm
- /etc/rc.filter_configure_sync
+ /etc/rc.filter_configure
touch /var/run/squid_alarm
fi
fi
@@ -56,7 +56,7 @@ while [ /bin/true ]; do
if [ -f /var/run/squid_alarm ]; then
echo "Squid has resumed. Reconfiguring filter." | \
logger -p daemon.info -i -t Squid_Alarm
- /etc/rc.filter_configure_sync
+ /etc/rc.filter_configure
rm /var/run/squid_alarm
fi
fi
diff --git a/config/squid-reverse/proxy_monitor.sh b/config/squid-reverse/proxy_monitor.sh
index fab2ee54..fa5a87bb 100644
--- a/config/squid-reverse/proxy_monitor.sh
+++ b/config/squid-reverse/proxy_monitor.sh
@@ -41,7 +41,7 @@ sleep 5
# Squid monitor 1.2
while [ /bin/true ]; do
if [ ! -f /var/run/squid_alarm ]; then
- NUM_PROCS=`ps auxw | grep "[s]quid -D"|awk '{print $2}'| wc -l | awk '{ print $1 }'`
+ NUM_PROCS=`ps auxw | grep "[s]quid -D"|awk '{print $2}'| wc -l | awk '{ print $1 }'`
if [ $NUM_PROCS -lt 1 ]; then
# squid is down
echo "Squid has exited. Reconfiguring filter." | \
@@ -50,16 +50,16 @@ while [ /bin/true ]; do
/usr/local/etc/rc.d/squid.sh start
sleep 3
echo "Reconfiguring filter..." | logger -p daemon.info -i -t Squid_Alarm
- /etc/rc.filter_configure_sync
+ /etc/rc.filter_configure
touch /var/run/squid_alarm
fi
fi
- NUM_PROCS=`ps auxw | grep "[s]quid -D"|awk '{print $2}'| wc -l | awk '{ print $1 }'`
+ NUM_PROCS=`ps auxw | grep "[s]quid -D"|awk '{print $2}'| wc -l | awk '{ print $1 }'`
if [ $NUM_PROCS -gt 0 ]; then
if [ -f /var/run/squid_alarm ]; then
echo "Squid has resumed. Reconfiguring filter." | \
logger -p daemon.info -i -t Squid_Alarm
- /etc/rc.filter_configure_sync
+ /etc/rc.filter_configure
rm /var/run/squid_alarm
fi
fi
diff --git a/config/squid-reverse/squid.inc b/config/squid-reverse/squid.inc
index 01a5edc6..9a951f56 100644
--- a/config/squid-reverse/squid.inc
+++ b/config/squid-reverse/squid.inc
@@ -266,7 +266,7 @@ function squid_deinstall_command() {
mwexec("ps awux | grep \"dnsserver\" | grep -v \"grep\" | awk '{ print $2 }' | xargs kill");
mwexec("ps awux | grep \"unlinkd\" | grep -v \"grep\" | awk '{ print $2 }' | xargs kill");
update_status("Reloading filter...");
- filter_configure_sync();
+ filter_configure();
}
function squid_before_form_general($pkg) {
diff --git a/config/squid/proxy_monitor.sh b/config/squid/proxy_monitor.sh
index fab2ee54..fa5a87bb 100644
--- a/config/squid/proxy_monitor.sh
+++ b/config/squid/proxy_monitor.sh
@@ -41,7 +41,7 @@ sleep 5
# Squid monitor 1.2
while [ /bin/true ]; do
if [ ! -f /var/run/squid_alarm ]; then
- NUM_PROCS=`ps auxw | grep "[s]quid -D"|awk '{print $2}'| wc -l | awk '{ print $1 }'`
+ NUM_PROCS=`ps auxw | grep "[s]quid -D"|awk '{print $2}'| wc -l | awk '{ print $1 }'`
if [ $NUM_PROCS -lt 1 ]; then
# squid is down
echo "Squid has exited. Reconfiguring filter." | \
@@ -50,16 +50,16 @@ while [ /bin/true ]; do
/usr/local/etc/rc.d/squid.sh start
sleep 3
echo "Reconfiguring filter..." | logger -p daemon.info -i -t Squid_Alarm
- /etc/rc.filter_configure_sync
+ /etc/rc.filter_configure
touch /var/run/squid_alarm
fi
fi
- NUM_PROCS=`ps auxw | grep "[s]quid -D"|awk '{print $2}'| wc -l | awk '{ print $1 }'`
+ NUM_PROCS=`ps auxw | grep "[s]quid -D"|awk '{print $2}'| wc -l | awk '{ print $1 }'`
if [ $NUM_PROCS -gt 0 ]; then
if [ -f /var/run/squid_alarm ]; then
echo "Squid has resumed. Reconfiguring filter." | \
logger -p daemon.info -i -t Squid_Alarm
- /etc/rc.filter_configure_sync
+ /etc/rc.filter_configure
rm /var/run/squid_alarm
fi
fi
diff --git a/config/squid/squid.inc b/config/squid/squid.inc
index 8dd2cc8e..3848b818 100644
--- a/config/squid/squid.inc
+++ b/config/squid/squid.inc
@@ -266,7 +266,7 @@ function squid_deinstall_command() {
mwexec("ps awux | grep \"dnsserver\" | grep -v \"grep\" | awk '{ print $2 }' | xargs kill");
mwexec("ps awux | grep \"unlinkd\" | grep -v \"grep\" | awk '{ print $2 }' | xargs kill");
update_status("Reloading filter...");
- filter_configure_sync();
+ filter_configure();
}
function squid_before_form_general($pkg) {
diff --git a/config/squid3/proxy_monitor.sh b/config/squid3/proxy_monitor.sh
index fab2ee54..fa5a87bb 100644
--- a/config/squid3/proxy_monitor.sh
+++ b/config/squid3/proxy_monitor.sh
@@ -41,7 +41,7 @@ sleep 5
# Squid monitor 1.2
while [ /bin/true ]; do
if [ ! -f /var/run/squid_alarm ]; then
- NUM_PROCS=`ps auxw | grep "[s]quid -D"|awk '{print $2}'| wc -l | awk '{ print $1 }'`
+ NUM_PROCS=`ps auxw | grep "[s]quid -D"|awk '{print $2}'| wc -l | awk '{ print $1 }'`
if [ $NUM_PROCS -lt 1 ]; then
# squid is down
echo "Squid has exited. Reconfiguring filter." | \
@@ -50,16 +50,16 @@ while [ /bin/true ]; do
/usr/local/etc/rc.d/squid.sh start
sleep 3
echo "Reconfiguring filter..." | logger -p daemon.info -i -t Squid_Alarm
- /etc/rc.filter_configure_sync
+ /etc/rc.filter_configure
touch /var/run/squid_alarm
fi
fi
- NUM_PROCS=`ps auxw | grep "[s]quid -D"|awk '{print $2}'| wc -l | awk '{ print $1 }'`
+ NUM_PROCS=`ps auxw | grep "[s]quid -D"|awk '{print $2}'| wc -l | awk '{ print $1 }'`
if [ $NUM_PROCS -gt 0 ]; then
if [ -f /var/run/squid_alarm ]; then
echo "Squid has resumed. Reconfiguring filter." | \
logger -p daemon.info -i -t Squid_Alarm
- /etc/rc.filter_configure_sync
+ /etc/rc.filter_configure
rm /var/run/squid_alarm
fi
fi
diff --git a/config/squid3/squid.inc b/config/squid3/squid.inc
index c1b5b419..784fea8f 100644
--- a/config/squid3/squid.inc
+++ b/config/squid3/squid.inc
@@ -286,7 +286,7 @@ function squid_deinstall_command() {
mwexec("ps awux | grep \"dnsserver\" | grep -v \"grep\" | awk '{ print $2 }' | xargs kill");
mwexec("ps awux | grep \"unlinkd\" | grep -v \"grep\" | awk '{ print $2 }' | xargs kill");
update_status("Reloading filter...");
- filter_configure_sync();
+ filter_configure();
}
function squid_before_form_general($pkg) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 04:49:40 +0000