aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal Luçi <ermal.luci@gmail.com>2012-07-22 08:42:51 -0700
committerErmal Luçi <ermal.luci@gmail.com>2012-07-22 08:42:51 -0700
commit4b4248be5bfacf56e10c168311c7d82d490ee951 (patch)
tree08103cadf8f1cb1d24b6714456668186b6dcd51f
parentf3b264b387bbc11b4ca9bd47661df6412f5622d4 (diff)
parent1a1124da89e8832cd4fb7ce0ba01d06d96971362 (diff)
downloadpfsense-packages-4b4248be5bfacf56e10c168311c7d82d490ee951.tar.gz
pfsense-packages-4b4248be5bfacf56e10c168311c7d82d490ee951.tar.bz2
pfsense-packages-4b4248be5bfacf56e10c168311c7d82d490ee951.zip
Merge pull request #289 from phil-davis/master
Change the default language to 'en' and fix proxy_monitor check
-rw-r--r--config/squid-reverse/proxy_monitor.sh4
-rw-r--r--config/squid-reverse/squid.xml2
2 files changed, 3 insertions, 3 deletions
diff --git a/config/squid-reverse/proxy_monitor.sh b/config/squid-reverse/proxy_monitor.sh
index fa5a87bb..a6d58e9b 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 -f"|awk '{print $2}'| wc -l | awk '{ print $1 }'`
if [ $NUM_PROCS -lt 1 ]; then
# squid is down
echo "Squid has exited. Reconfiguring filter." | \
@@ -54,7 +54,7 @@ while [ /bin/true ]; do
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 -f"|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." | \
diff --git a/config/squid-reverse/squid.xml b/config/squid-reverse/squid.xml
index 7ca2c1e9..a8f9a53f 100644
--- a/config/squid-reverse/squid.xml
+++ b/config/squid-reverse/squid.xml
@@ -345,7 +345,7 @@
<fieldname>error_language</fieldname>
<description>Select the language in which the proxy server will display error messages to users.</description>
<type>select</type>
- <default_value>English</default_value>
+ <default_value>en</default_value></default_value>
</field>
<field>
<fielddescr>Disable X-Forward</fielddescr>