[debian-lan-devel] [debian-lan] 06/06: Fixes and updates for squid and dhcp-server.

[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 2546399f9fa9b9f321727319a6286b619f87d28a
Author: Andreas B. Mundt <andi at debian.org>
Date:   Fri Aug 5 11:13:58 2016 +0200

    Fixes and updates for squid and dhcp-server.
---
 fai/config/debconf/SERVER_A              | 2 --
 fai/config/package_config/PROXY          | 2 +-
 fai/config/scripts/PROXY/10-config       | 6 +++---
 fai/config/scripts/PROXY/30-dansguardian | 2 +-
 fai/config/scripts/SERVER_A/10-misc      | 5 ++++-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/fai/config/debconf/SERVER_A b/fai/config/debconf/SERVER_A
index 8965d34..6c6bb1b 100644
--- a/fai/config/debconf/SERVER_A
+++ b/fai/config/debconf/SERVER_A
@@ -1,5 +1,3 @@
-## Network interfaces on which the DHCP server should listen:
-isc-dhcp-server isc-dhcp-server/interfaces string eth0
 ## Do you want system-wide readable home directories?
 adduser adduser/homedir-permission boolean false
 ## Automatically download and install stable updates?
diff --git a/fai/config/package_config/PROXY b/fai/config/package_config/PROXY
index a2e02c2..d033bad 100644
--- a/fai/config/package_config/PROXY
+++ b/fai/config/package_config/PROXY
@@ -1,7 +1,7 @@
 ## Only list packages that are essential for the PROXY class.
 ## Put all setup-dependent packages in the SETUP_* class.
 PACKAGES aptitude
-squid3
+squid
 
 ## FIXME #722717
 #adzapper
diff --git a/fai/config/scripts/PROXY/10-config b/fai/config/scripts/PROXY/10-config
index 4d5255c..db98dbe 100755
--- a/fai/config/scripts/PROXY/10-config
+++ b/fai/config/scripts/PROXY/10-config
@@ -14,7 +14,7 @@ editfiles:
 #         ReplaceAll 'ZAP_MODE=""' With 'ZAP_MODE="CLEAR"'
 #       }
 
-        { ${target}/etc/squid3/squid.conf
+        { ${target}/etc/squid/squid.conf
           ## Define local network:
           ReplaceAll "#acl localnet src 10.0.0.0/8" With "acl localnet src ${SUBNETMASK}"
 
@@ -45,9 +45,9 @@ editfiles:
           EndGroup
 
           ## Use disk cache:
-          BeginGroupIfNoSuchLine 'cache_dir aufs /var/spool/squid3 10000 16 256'
+          BeginGroupIfNoSuchLine 'cache_dir aufs /var/spool/squid 10000 16 256'
             LocateLineMatching '#cache_dir .*'
-            InsertLine 'cache_dir aufs /var/spool/squid3 10000 16 256'
+            InsertLine 'cache_dir aufs /var/spool/squid 10000 16 256'
           EndGroup
 
 ## FIXME #722717
diff --git a/fai/config/scripts/PROXY/30-dansguardian b/fai/config/scripts/PROXY/30-dansguardian
index b5e443a..36dbc4d 100755
--- a/fai/config/scripts/PROXY/30-dansguardian
+++ b/fai/config/scripts/PROXY/30-dansguardian
@@ -7,5 +7,5 @@ if $ROOTCMD which dansguardian > /dev/null ; then
     ## enable dansguardian:
     sed -i "s/^UNCONFIGURED/\# Line commented by FAI.  UNCONFIGURED/"  ${target}/etc/dansguardian/dansguardian.conf
     ## disable access to squid from the network (commented, access needed for APT):
-    #sed -i "/^http_access allow localnet$/d" ${target}/etc/squid3/squid.conf
+    #sed -i "/^http_access allow localnet$/d" ${target}/etc/squid/squid.conf
 fi
diff --git a/fai/config/scripts/SERVER_A/10-misc b/fai/config/scripts/SERVER_A/10-misc
index b68a79d..bd566c5 100755
--- a/fai/config/scripts/SERVER_A/10-misc
+++ b/fai/config/scripts/SERVER_A/10-misc
@@ -37,8 +37,11 @@ if [ "$FAI_ACTION" != "install" ] && [ "$CONVERT" != "true" ] ; then
     exit 0
 fi
 
-## Generate '/etc/network/interfaces':
+## Listen to DHCP requests on the local interface:
+$ROOTCMD sed -i "s/\(^INTERFACESv4=*\)/\#\1/" $target/etc/default/isc-dhcp-server
+ainsl -v /etc/default/isc-dhcp-server "INTERFACESv4=\"${NIC_LABEL0}\""
 
+## Generate '/etc/network/interfaces':
 cat > $target/etc/network/interfaces <<EOF
 # The loopback network interface
 auto lo

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