[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.8-9-g52dded8

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 3d040536a3f1397185a06627c9b5372a6c4803af
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sat Mar 23 22:27:46 2013 +0100

    Fix squid configuration.
    
    Make squid configuration succeed in the first cfengine run.
    Do not add the cups lines again on the next runs.

diff --git a/fai/config/scripts/PROXY/10-config b/fai/config/scripts/PROXY/10-config
index 393aeb0..e912683 100755
--- a/fai/config/scripts/PROXY/10-config
+++ b/fai/config/scripts/PROXY/10-config
@@ -13,24 +13,26 @@ editfiles:
 	}
 
 	{ ${target}/etc/squid3/squid.conf
-	  ## Define url_rewrite_program:
-	  BeginGroupIfNoSuchLine "url_rewrite_program /usr/bin/adzapper.wrapper"
-	     LocateLineMatching "#  TAG: url_rewrite_program"
-	     InsertLine "url_rewrite_program /usr/bin/adzapper.wrapper"
-	  EndGroup
-
+	  ## Define local network:
 	  ReplaceAll "#acl localnet src 10.0.0.0/8" With "acl localnet src ${SUBNETMASK}"
 
+	  ## Allow CUPS access:
+	  BeginGroupIfNoSuchLine 'acl SSL_ports port 631		# cups'
+	    LocateLineMatching 'acl SSL_ports port 443.*'
+	    InsertLine 'acl SSL_ports port 631		# cups'
+	    LocateLineMatching 'acl Safe_ports port 443.*'
+	    InsertLine 'acl Safe_ports port 631		# cups'
+	  EndGroup
+
+	  ## Allow local network:
 	  BeginGroupIfNoSuchLine "http_access allow localnet"
 	    LocateLineMatching "http_access allow localhost"
 	    InsertLine "http_access allow localnet"
 	  EndGroup
 
-	  ## Allow CUPS access:
-	  BeginGroupIfNoSuchLine 'acl SSL_ports port 631.*'
-	    LocateLineMatching 'acl SSL_ports port 443.*'
-	    InsertLine 'acl SSL_ports port 631          # cups'
-	    LocateLineMatching 'acl Safe_ports port 443.*'
-	    InsertLine 'acl Safe_ports port 631         # cups'
+	  ## Define url_rewrite_program:
+	  BeginGroupIfNoSuchLine "url_rewrite_program /usr/bin/adzapper.wrapper"
+	     LocateLineMatching "#  TAG: url_rewrite_program"
+	     InsertLine "url_rewrite_program /usr/bin/adzapper.wrapper"
 	  EndGroup
 	}

-- 
Debian-LAN development and packaging