From 4620ccdea9b049b1c708c62266f838ec1481afca Mon Sep 17 00:00:00 2001
From: Seth Mos <seth.mos@xs4all.nl>
Date: Wed, 20 Dec 2006 12:16:26 +0000
Subject: Lower proxy monitor sleep time for earlier detection. Point XML files
 to new squid location

---
 packages/squid/proxy_monitor.sh |  2 +-
 packages/squid/squid.xml        | 20 ++++++++++----------
 packages/squid/squid_ng.xml     | 16 ++++++++--------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/squid/proxy_monitor.sh b/packages/squid/proxy_monitor.sh
index d0035d1a..22d2f81e 100644
--- a/packages/squid/proxy_monitor.sh
+++ b/packages/squid/proxy_monitor.sh
@@ -29,7 +29,7 @@
 
 set -e
 
-LOOP_SLEEP=300
+LOOP_SLEEP=55
 
 if [ -f /var/run/squid_alarm ]; then
 	rm /var/run/squid_alarm
diff --git a/packages/squid/squid.xml b/packages/squid/squid.xml
index 13398b3d..6a8b4e32 100644
--- a/packages/squid/squid.xml
+++ b/packages/squid/squid.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packagegui>
 	<name>squid</name>
-	<version>2.5.14_2-p7</version>
+	<version>2.6.5_1-p2</version>
 
 	<include_file>/usr/local/pkg/squid.inc</include_file>
 	<!-- Installation -->
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/squid.inc</item>
+		<item>http://www.pfsense.org/packages/config/squid/squid.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/squid_cache.xml</item>
+		<item>http://www.pfsense.org/packages/config/squid/squid_cache.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/squid_nac.xml</item>
+		<item>http://www.pfsense.org/packages/config/squid/squid_nac.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/squid_ng.xml</item>
+		<item>http://www.pfsense.org/packages/config/squid/squid_ng.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/squid_traffic.xml</item>
+		<item>http://www.pfsense.org/packages/config/squid/squid_traffic.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/squid_upstream.xml</item>
+		<item>http://www.pfsense.org/packages/config/squid/squid_upstream.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/squid_auth.xml</item>
+		<item>http://www.pfsense.org/packages/config/squid/squid_auth.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/squid_users.xml</item>
+		<item>http://www.pfsense.org/packages/config/squid/squid_users.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/proxy_monitor.sh</item>
+		<item>http://www.pfsense.org/packages/config/squid/proxy_monitor.sh</item>
 	    <prefix>/usr/local/etc/rc.d/</prefix>
 	    <chmod>0755</chmod>
 	</additional_files_needed>
diff --git a/packages/squid/squid_ng.xml b/packages/squid/squid_ng.xml
index 6d98f00f..0b01a594 100644
--- a/packages/squid/squid_ng.xml
+++ b/packages/squid/squid_ng.xml
@@ -26,42 +26,42 @@
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/squid_cache.xml</item>
+		<item>http://www.pfsense.com/packages/config/squid/squid_cache.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/squid_nac.xml</item>
+	    <item>http://www.pfsense.com/packages/config/squid/squid_nac.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/squid_ng.inc</item>
+	    <item>http://www.pfsense.com/packages/config/squid/squid_ng.inc</item>
 	</additional_files_needed>
    	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/squid_traffic.xml</item>
+	    <item>http://www.pfsense.com/packages/config/squid/squid_traffic.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/squid_upstream.xml</item>
+	    <item>http://www.pfsense.com/packages/config/squid/squid_upstream.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/squid_auth.xml</item>
+		<item>http://www.pfsense.com/packages/config/squid/squid_auth.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/squid_auth.inc</item>
+		<item>http://www.pfsense.com/packages/config/squid/squid_auth.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/squid_extauth.xml</item>
+		<item>http://www.pfsense.com/packages/config/squid/squid_extauth.xml</item>
 	</additional_files_needed>
 	<tabs>
 		<tab>
-- 
cgit v1.2.3