From 2416bcb81f4833fd0d1348d96e0e31ab85d7f247 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil.davis@world.inf.org>
Date: Sun, 22 Jul 2012 15:43:33 +0545
Subject: Change the default language to the language code 'en' - Squid V3 uses
 the 2-char language codes

---
 config/squid-reverse/squid.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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>
-- 
cgit v1.2.3


From 1a1124da89e8832cd4fb7ce0ba01d06d96971362 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil.davis@world.inf.org>
Date: Sun, 22 Jul 2012 15:57:57 +0545
Subject: Fix grep for squid process since "-D" was obsolete.

---
 config/squid-reverse/proxy_monitor.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 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." | \
-- 
cgit v1.2.3