[debian-edu-commits] r78768 - branches/wheezy/debian-edu-config/cf

[schweer-guest at alioth.debian.org]

Author: schweer-guest
Date: 2013-01-16 20:23:03 +0000 (Wed, 16 Jan 2013)
New Revision: 78768

Added:
   branches/wheezy/debian-edu-config/cf/cf.ldap2zone
Removed:
   branches/wheezy/debian-edu-config/cf/cf.network
Modified:
   branches/wheezy/debian-edu-config/cf/cf.bind
Log:
remove obsolete file cf.network
split bind configuration into cf.bind and cf.ldap2zone


Modified: branches/wheezy/debian-edu-config/cf/cf.bind
===================================================================
--- branches/wheezy/debian-edu-config/cf/cf.bind	2013-01-16 20:20:06 UTC (rev 78767)
+++ branches/wheezy/debian-edu-config/cf/cf.bind	2013-01-16 20:23:03 UTC (rev 78768)
@@ -12,13 +12,6 @@
     { /etc/bind/named.conf.local
         AppendIfNoSuchLine 'include "/etc/bind/named.conf.ldap2zone";'
     }
-    # Configure ldap2zone for Debian Edu:
-    { /etc/default/ldap2zone
-        BeginGroupIfNoSuchLine 'BIND_DATA="/etc/bind"
-          HashCommentLinesStarting 'BIND_DATA='
-          InsertLine 'BIND_DATA="/etc/bind"'
-        EndGroup
-    }
     # Disable IPv6 (to silence IPv6 lookup failure messages): 
     { /etc/default/bind9
         BeginGroupIfNoSuchLine 'OPTIONS="-4 -u bind"'

Added: branches/wheezy/debian-edu-config/cf/cf.ldap2zone
===================================================================
--- branches/wheezy/debian-edu-config/cf/cf.ldap2zone	                        (rev 0)
+++ branches/wheezy/debian-edu-config/cf/cf.ldap2zone	2013-01-16 20:23:03 UTC (rev 78768)
@@ -0,0 +1,13 @@
+#
+# Configure ldap2zone to work with bind 
+#
+
+editfiles:
+  debian.server.installation::
+    # Configure ldap2zone for Debian Edu: 
+    { /etc/default/ldap2zone
+    BeginGroupIfNoSuchLine 'BIND_DATA="/etc/bind"'
+       LocateLineMatching '#BIND_DATA=/var/cache/bind"'
+       InsertLine 'BIND_DATA="/etc/bind"'
+    EndGroup
+    }

Deleted: branches/wheezy/debian-edu-config/cf/cf.network
===================================================================
--- branches/wheezy/debian-edu-config/cf/cf.network	2013-01-16 20:20:06 UTC (rev 78767)
+++ branches/wheezy/debian-edu-config/cf/cf.network	2013-01-16 20:23:03 UTC (rev 78768)
@@ -1,25 +0,0 @@
-editfiles:
-
-  debian.server.installation::
-
-	{ /etc/network/interfaces
-        BeginGroupIfNoSuchLine 'iface eth0 inet static'
-          LocateLineMatching 'iface lo inet loopback'
-          InsertLine ''
-          InsertLine 'dns-nameservers 127.0.0.1'
-          InsertLine ''
-          InsertLine 'dns-search intern'
-          InsertLine ''
-          InsertLine 'auto eth0'
-          InsertLine 'iface eth0 inet static'
-          InsertLine 'address 10.0.2.2'
-          InsertLine 'gateway 10.0.0.1'
-        EndGroup
-
-          ResetSearch "1"
-
-        BeginGroupIfNoSuchLine '#iface eth0 inet dhcp'
-          LocateLineMatching 'iface eth0 inet dhcp'
-          ReplaceLineWith '#iface eth0 inet dhcp'
-        EndGroup
-	}