aboutsummaryrefslogtreecommitdiffstats
path: root/config/squid3
diff options
context:
space:
mode:
Diffstat (limited to 'config/squid3')
-rw-r--r--config/squid3/proxy_monitor.sh5
-rw-r--r--config/squid3/squid.xml2
2 files changed, 6 insertions, 1 deletions
diff --git a/config/squid3/proxy_monitor.sh b/config/squid3/proxy_monitor.sh
index fa5a87bb..00430018 100644
--- a/config/squid3/proxy_monitor.sh
+++ b/config/squid3/proxy_monitor.sh
@@ -27,6 +27,11 @@
# POSSIBILITY OF SUCH DAMAGE.
#
+if [ `pgrep -f "proxy_monitor.sh"|wc -l` -ge 1 ]; then
+ exit 0
+fi
+
+
set -e
LOOP_SLEEP=55
diff --git a/config/squid3/squid.xml b/config/squid3/squid.xml
index f82cf81a..ea13625e 100644
--- a/config/squid3/squid.xml
+++ b/config/squid3/squid.xml
@@ -249,7 +249,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>
</field>
<field>
<fielddescr>Disable X-Forward</fielddescr>