[debian-edu-commits] debian-edu/ 01/01: Fix ldap2zone configuration, now that upstream changed the defaults and dropped the file /etc/default/ldap2zone; adjust Makefile.

[Wolfgang Schweer]

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

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit bb8447d894b36b3fd805d5a50b4021b7ceb53e03
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Fri Apr 29 00:23:23 2016 +0200

    Fix ldap2zone configuration, now that upstream changed the defaults and dropped the file /etc/default/ldap2zone; adjust Makefile.
---
 Makefile              |  2 +-
 cf/cf.ldap2zone       | 11 -----------
 debian/changelog      |  2 ++
 etc/default/ldap2zone | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 7896d52..188b1ae 100644
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,6 @@ CFFILES = \
 	cf.syslog \
 	cf.sysstat \
 	cf.testsetup \
-	cf.ldap2zone \
 	cfd.conf \
 	cfengine.conf
 
@@ -97,6 +96,7 @@ SYSCONFFILES = \
 	debian-edu/hd-warn.conf \
 	debian-edu/nightkill.conf \
 	default/munin-node \
+	default/ldap2zone \
 	cfengine/cfservd.conf \
 	cfengine/update.conf \
 	cfengine/inputs/cfagent.conf \
diff --git a/cf/cf.ldap2zone b/cf/cf.ldap2zone
deleted file mode 100644
index 589e61a..0000000
--- a/cf/cf.ldap2zone
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Configure ldap2zone to work with bind 
-#
-
-editfiles:
-  debian.server.installation::
-    # Configure ldap2zone for Debian Edu: 
-    { /etc/default/ldap2zone
-       LocateLineMatching '#BIND_DATA="/var/cache/bind"'
-       AppendIfNoSuchLine 'BIND_DATA="/etc/bind"'
-    }
diff --git a/debian/changelog b/debian/changelog
index 1070bf5..3a6fa9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,8 @@ debian-edu-config (1.901) UNRELEASED; urgency=medium
   * Add file Debian-custom/001-ltsp-settings. This fixes LTSP chroot
     installation in case that ltsp-client-builder doesn't look up another
     mirror if cdrom is still mounted.
+  * Fix ldap2zone configuration, now that upstream changed the defaults and
+    dropped the file /etc/default/ldap2zone; adjust Makefile.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 14 Apr 2016 23:32:10 +0200
 
diff --git a/etc/default/ldap2zone b/etc/default/ldap2zone
new file mode 100644
index 0000000..733cd2e
--- /dev/null
+++ b/etc/default/ldap2zone
@@ -0,0 +1,40 @@
+# Configuration file for automatic deployment of ldap2zone generated zones to bind.
+# Example file adapted for use with Debian Edu.
+
+# Should we run the cronjob, make sure to set to something other than "false" for enabling ldap2bind.
+# DEFAULT: "false"
+RUN_DEPLOY="true"
+
+# How the LDAP server can be accessed
+# If empty, nothing ldap2bind won't do anything...
+# DEFAULT: ""
+LDAP_URI="ldap://localhost"
+
+# Where the bind config is stored
+# DEFAULT: "/etc/bind"
+BIND_DIR="/etc/bind"
+
+# Where the zonefiles are located
+# DEFAULT: "/var/cache/bind"
+BIND_DATA="/etc/bind"
+
+# Time to live value for a and ptr records
+# DEFAULT: 500 Seconds
+TTL="500"
+
+# Prefix for zone definition files
+# DEFAULT: "db."
+# The zone definition file for 0.168.192.in-addr.arpa is stored as 'db.0.168.192.in-addr.arpa'
+PREFIX="db."
+
+# Allow Updates from these networks (semicolon separated and ended)
+# DEFAULT: Don't allow updates
+#ALLOW_UPDATE="192.168.0.0/24;"
+
+# Allow Transfer to zones (semicolon separated and ended)
+# DEFAULT: Dont allow zone transfer
+#ALLOW_TRANSFER="192.168.0.1;"
+
+# Allow notify to slaves (semicolon separated and ended)
+# DEFAULT: Dont allow notify
+#ALLOW_NOTIFY="notify yes;"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git