[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. debian/0.12-1-g8e12bcf

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 8e12bcf600ed74bd4fb7f393faa0d09a861fd394
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sun Jul 7 11:01:18 2013 +0200

    Fix timeout in PXE menu.  Make cfengine succeed in a single run.
    
    Make sure 'Debian-LAN Live System' is started after the timeout.
    Re-order cfengine modifications of 'squid.conf', to be able to do all
    edits in a single run.  Increase squid disk cache size.

diff --git a/fai/config/files/etc/rc.local/FAISERVER b/fai/config/files/etc/rc.local/FAISERVER
index eb83f9f..a7165c4 100755
--- a/fai/config/files/etc/rc.local/FAISERVER
+++ b/fai/config/files/etc/rc.local/FAISERVER
@@ -121,7 +121,6 @@ menu cmdlinerow 12
 menu tabmsgrow 13
 default debian-installer/i386/boot-screens/vesamenu.c32
 timeout 150
-ontimeout fai-generated
 prompt 0
 noescape 1
 
diff --git a/fai/config/scripts/PROXY/10-config b/fai/config/scripts/PROXY/10-config
index 79f4487..fb6ad23 100755
--- a/fai/config/scripts/PROXY/10-config
+++ b/fai/config/scripts/PROXY/10-config
@@ -16,9 +16,6 @@ editfiles:
 	  ## Define local network:
 	  ReplaceAll "#acl localnet src 10.0.0.0/8" With "acl localnet src ${SUBNETMASK}"
 
-	  ## Use disk cache:
-	  ReplaceAll "#cache_dir ufs /var/spool/squid3 100 16 256" With "cache_dir ufs /var/spool/squid3 100 16 256"
-
 	  ## Allow CUPS access:
 	  BeginGroupIfNoSuchLine 'acl SSL_ports port 631$(tab)$(tab)# cups'
 	    LocateLineMatching 'acl SSL_ports port 443.*'
@@ -33,6 +30,9 @@ editfiles:
 	    InsertLine "http_access allow localnet"
 	  EndGroup
 
+	  ## Use disk cache:
+	  ReplaceAll "#cache_dir ufs /var/spool/squid3 100 16 256" With "cache_dir ufs /var/spool/squid3 1000 16 256"
+
 	  ## Define url_rewrite_program:
 	  BeginGroupIfNoSuchLine "url_rewrite_program /usr/bin/adzapper.wrapper"
 	     LocateLineMatching "#  TAG: url_rewrite_program"

-- 
Debian-LAN development and packaging