[debian-lan-devel] [debian-lan] 02/02: Fix ordering to succeed in single cfengine pass.

[Andreas B. Mundt]

This is an automated email from the git hooks/post-receive script.

andi pushed a commit to branch master
in repository debian-lan.

commit 442ad2bb48106068d6c5fc607aa6fc0355c62a13
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sat Feb 21 09:25:13 2015 +0100

    Fix ordering to succeed in single cfengine pass.
    
    Comment unavailable/orphaned package.  Untabify.
---
 fai/config/package_config/PROXY    |  5 ++-
 fai/config/scripts/PROXY/10-config | 89 ++++++++++++++++++++------------------
 2 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/fai/config/package_config/PROXY b/fai/config/package_config/PROXY
index 1771809..a2e02c2 100644
--- a/fai/config/package_config/PROXY
+++ b/fai/config/package_config/PROXY
@@ -2,6 +2,9 @@
 ## Put all setup-dependent packages in the SETUP_* class.
 PACKAGES aptitude
 squid3
-adzapper
+
+## FIXME #722717
+#adzapper
+
 ## Uncomment for web filtering:
 #dansguardian
diff --git a/fai/config/scripts/PROXY/10-config b/fai/config/scripts/PROXY/10-config
index acfa52c..4d5255c 100755
--- a/fai/config/scripts/PROXY/10-config
+++ b/fai/config/scripts/PROXY/10-config
@@ -7,55 +7,58 @@ control:
 
 editfiles:
    any::
-	{ ${target}/etc/adzapper.conf
-	  ## Configure adzapper:
-	  ReplaceAll 'ZAP_MODE=""' With 'ZAP_MODE="CLEAR"'
-	}
 
-	{ ${target}/etc/squid3/squid.conf
-	  ## Define local network:
-	  ReplaceAll "#acl localnet src 10.0.0.0/8" With "acl localnet src ${SUBNETMASK}"
+## FIXME #722717
+#       { ${target}/etc/adzapper.conf
+#         ## Configure adzapper:
+#         ReplaceAll 'ZAP_MODE=""' With 'ZAP_MODE="CLEAR"'
+#       }
 
-	  ## Allow CUPS access:
-	  BeginGroupIfNoSuchLine 'acl SSL_ports port 631$(tab)$(tab)# cups'
-	    LocateLineMatching 'acl SSL_ports port 443.*'
-	    InsertLine 'acl SSL_ports port 631$(tab)$(tab)# cups'
-	    LocateLineMatching 'acl Safe_ports port 443.*'
-	    InsertLine 'acl Safe_ports port 631$(tab)$(tab)# cups'
-	  EndGroup
+        { ${target}/etc/squid3/squid.conf
+          ## Define local network:
+          ReplaceAll "#acl localnet src 10.0.0.0/8" With "acl localnet src ${SUBNETMASK}"
 
-	  ## 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$(tab)$(tab)# cups'
+            LocateLineMatching 'acl SSL_ports port 443.*'
+            InsertLine 'acl SSL_ports port 631$(tab)$(tab)# cups'
+            LocateLineMatching 'acl Safe_ports port 443.*'
+            InsertLine 'acl Safe_ports port 631$(tab)$(tab)# cups'
+          EndGroup
 
-	  ## Package cache:
-	  BeginGroupIfNoSuchLine 'maximum_object_size_in_memory 10240 KB'
-	    LocateLineMatching '# maximum_object_size_in_memory .*'
-	    InsertLine 'maximum_object_size_in_memory 10240 KB'
-	  EndGroup
+          ## Allow local network:
+          BeginGroupIfNoSuchLine "http_access allow localnet"
+            LocateLineMatching "http_access allow localhost"
+            InsertLine "http_access allow localnet"
+          EndGroup
 
-	  ## Use disk cache:
-	  BeginGroupIfNoSuchLine 'cache_dir aufs /var/spool/squid3 10000 16 256'
-	    LocateLineMatching '#cache_dir .*'
-	    InsertLine 'cache_dir aufs /var/spool/squid3 10000 16 256'
-	  EndGroup
+          ## Package cache:
+          BeginGroupIfNoSuchLine 'maximum_object_size_in_memory 10240 KB'
+            LocateLineMatching '# maximum_object_size_in_memory .*'
+            InsertLine 'maximum_object_size_in_memory 10240 KB'
+          EndGroup
 
-	  ## Package cache:
-	  BeginGroupIfNoSuchLine 'maximum_object_size 512 MB'
-	    LocateLineMatching '# maximum_object_size .*'
-	    InsertLine 'maximum_object_size 512 MB'
-	  EndGroup
+          ## Package cache:
+          BeginGroupIfNoSuchLine 'maximum_object_size 512 MB'
+            LocateLineMatching '# maximum_object_size .*'
+            InsertLine 'maximum_object_size 512 MB'
+          EndGroup
 
-	  ## 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
+          ## Use disk cache:
+          BeginGroupIfNoSuchLine 'cache_dir aufs /var/spool/squid3 10000 16 256'
+            LocateLineMatching '#cache_dir .*'
+            InsertLine 'cache_dir aufs /var/spool/squid3 10000 16 256'
+          EndGroup
 
-	  ## Package cache:
-	  BeginGroupIfNoSuchLine 'refresh_pattern deb$(dollar)   129600 100% 129600'
+## FIXME #722717
+#         ## 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
+
+          ## Package cache:
+          BeginGroupIfNoSuchLine 'refresh_pattern deb$(dollar)   129600 100% 129600'
             LocateLineMatching "#  TAG: refresh_pattern"
             InsertLine 'refresh_pattern deb$(dollar)   129600 100% 129600'
             InsertLine 'refresh_pattern udeb$(dollar)   129600 100% 129600'
@@ -65,5 +68,5 @@ editfiles:
             InsertLine 'refresh_pattern \/(Packages|Sources)(|\.bz2|\.gz|\.xz)$(dollar) 0 0% 0 refresh-ims'
             InsertLine 'refresh_pattern \/Release(|\.gpg)$(dollar) 0 0% 0 refresh-ims'
             InsertLine 'refresh_pattern \/InRelease$(dollar) 0 0% 0 refresh-ims'
-	  EndGroup
-	}
+          EndGroup
+        }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/debian-lan.git