[debian-edu-commits] debian-edu/ 01/01: More pdns related clean up.
Holger Levsen
holger at moszumanska.debian.org
Tue Oct 21 19:35:40 UTC 2014
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch master
in repository debian-edu-config.
commit e5a16d858066ab27cdadcf1ba991ff22772fa747
Author: Holger Levsen <holger at layer-acht.org>
Date: Tue Oct 21 21:34:43 2014 +0200
More pdns related clean up.
* Cleanup the installed cf/cf.pdns
file in postinst too.
* Drop class pdns in cf/cfengine.conf.
* Drop (/etc/)insserv.conf.d/debian-edu-config which only modified pdns
init and (/etc/)powerdns/pdns.d/pdns-debian-edu.conf. Add cleanup code in
postinst for upgrades from previous versions.
---
Makefile | 2 --
cf/cfengine.conf | 1 -
debian/changelog | 8 ++++++--
debian/debian-edu-config.fetch-ldap-cert | 6 +++---
debian/debian-edu-config.postinst | 6 ++++++
debian/dirs | 1 -
etc/insserv.conf.d/debian-edu-config | 1 -
etc/powerdns/pdns.d/pdns-debian-edu.conf | 21 ---------------------
8 files changed, 15 insertions(+), 31 deletions(-)
diff --git a/Makefile b/Makefile
index 00ffeb2..827b887 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,6 @@ SYSCONFFILES = \
php5/apache2/php-debian-edu.ini \
insserv/overrides/kdm \
insserv/overrides/ntp \
- insserv.conf.d/debian-edu-config \
ldap/rootDSE-debian-edu.ldif \
ldap/slapd-squeeze_debian-edu.conf \
ldap/ssl/slapd-cert.cnf \
@@ -174,7 +173,6 @@ SYSCONFFILES = \
nagios3/debian-edu/timeperiods.cfg \
munin/debian-edu-munin-node.conf \
polkit-1/localauthority.conf.d/80-edu-admin.conf \
- powerdns/pdns.d/pdns-debian-edu.conf \
dbus-1/system.d/hal-debian-edu.conf \
nbd-server/conf.d/debian-edu.conf
diff --git a/cf/cfengine.conf b/cf/cfengine.conf
index e3cc34a..af679e6 100644
--- a/cf/cfengine.conf
+++ b/cf/cfengine.conf
@@ -86,7 +86,6 @@ groups:
roaming = ( "/bin/grep -q 'Roaming-Workstation' /etc/debian-edu/config" )
standalone = ( "/usr/bin/test ! -e /usr/bin/ntpq" )
ltspclient = ( "/usr/bin/test -e /usr/bin/getltscfg" )
- pdns = ( "/usr/bin/test -x /usr/sbin/pdns_server" )
# Set if the internet is reachable for downloading files
internet = ( "/usr/bin/wget -qO /dev/null http://ftp.skolelinux.org/welcome.msg " )
diff --git a/debian/changelog b/debian/changelog
index 766809b..c4df9bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,9 @@ debian-edu-config (1.812) UNRELEASED; urgency=low
gosa-plugin-netgroups is depended upon in the relevant task in the
debian-edu package.
* Drop debian/TODO.Squeeze, the content was obsolete anyway.
- * Drop cf/cf.pdns, we switched backed to bind9.
- * Drop class lenny in cf/cfengine.conf and cf/cf.kdm.
+ * Drop cf/cf.pdns, we switched backed to bind9. Cleanup the installed file
+ in postinst too.
+ * Drop classes lenny and pdns in cf/cfengine.conf and lenny in cf/cf.kdm.
* Drop code from debian-edu-config.(preinst|postinst) handling upgrades
from lenny area packages and earlier. Kept the squeeze stuff for people
skipping a release. (Which is still unsupported but we can still be
@@ -23,6 +24,9 @@ debian-edu-config (1.812) UNRELEASED; urgency=low
/usr/share/ltsp/ltsp_config.d/. The content was removed for Squeeze
on 2010-08-18, and the file should be dropped for squeeze+1."
* Drop useless dependency on base-files, which is required.
+ * Drop (/etc/)insserv.conf.d/debian-edu-config which only modified pdns
+ init and (/etc/)powerdns/pdns.d/pdns-debian-edu.conf. Add cleanup code in
+ postinst for upgrades from previous versions.
-- Petter Reinholdtsen <pere at debian.org> Mon, 20 Oct 2014 20:54:21 +0200
diff --git a/debian/debian-edu-config.fetch-ldap-cert b/debian/debian-edu-config.fetch-ldap-cert
index 0759bd6..3b03848 100644
--- a/debian/debian-edu-config.fetch-ldap-cert
+++ b/debian/debian-edu-config.fetch-ldap-cert
@@ -8,9 +8,6 @@
# Default-Stop:
# Short-Description: Fetch LDAP SSL public key from the server
# Description:
-# Start before isc-dhcp-server to give pdns time to become
-# operational before the dhcp server start looking for the
-# LDAP server using DNS, as a workaround for #585966.
# Start before krb5-kdc to give slapd time to become operational
# before krb5-kdc try to connect to the LDAP server as a workaround
# for #589915.
@@ -27,6 +24,9 @@ set -e
CERTFILE=/etc/ldap/ssl/ldap-server-pubkey.pem
# Workaround for #585966, give pdns time to become operational
+# This workaround should be removed early in the jessie+1 development
+# cycle. it's probably not needed now that pdns is gone, but too
+# risky to remove so close before the freeze
sleep 2
do_start() {
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index 22495c1..7840add 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -230,6 +230,12 @@ configure)
fi
fi
+ if dpkg --compare-versions "$2" le "1.811"; then
+ rm_conffile debian-edu-config /etc/cfengine/debian-edu/cf.pdns
+ rm_conffile debian-edu-config /etc/insserv.conf.d/debian-edu-config
+ rm_conffile debian-edu-config /etc/powerdns/pdns.d/pdns-debian-edu.conf
+ fi
+
# sssd refuses to read the file if it has any other mode
chmod 600 /etc/sssd/sssd-debian-edu.conf
chown root:root /etc/sssd/sssd-debian-edu.conf
diff --git a/debian/dirs b/debian/dirs
index 277d041..7a8dec4 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -19,7 +19,6 @@ etc/samba/netlogon
etc/slbackup/pre.d
etc/skel/.local/share
etc/X11/Xsession.d
-etc/powerdns/pdns.d
usr/bin
usr/share/debian-edu-config/tools
usr/share/doc/debian-edu-config
diff --git a/etc/insserv.conf.d/debian-edu-config b/etc/insserv.conf.d/debian-edu-config
deleted file mode 100644
index 0f9d957..0000000
--- a/etc/insserv.conf.d/debian-edu-config
+++ /dev/null
@@ -1 +0,0 @@
-$named +pdns +pdns-recursor
diff --git a/etc/powerdns/pdns.d/pdns-debian-edu.conf b/etc/powerdns/pdns.d/pdns-debian-edu.conf
deleted file mode 100644
index b6e741a..0000000
--- a/etc/powerdns/pdns.d/pdns-debian-edu.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# LDAP server configuration
-# Do not use a hostname here, unless you also add that name to the
-# /etc/hosts file.
-ldap-host=ldapi://
-ldap-method=strict
-ldap-basedn=dc=skole,dc=skolelinux,dc=no
-#start the ldap backend on boot.
-launch=ldap
-#Only recurse if question cannot be answered locally
-lazy-recursion=yes
-# IP Addresses of recursive nameservers, eg your ISP's servers. This
-# example uses the pdns-recursor running localy on a custom port.
-
-recursor=127.0.0.1:1553
-# Make sure DNS lookups are fairly quick even when no Internet
-# connection is available. Solves Skolelinux bug #1410.
-
-allow-recursion-override=on
-
-# Addresses/interfaces to listen to is generated during first boot and
-# stored in /etc/powerdns/pdns.d/pdns-debian-edu-if.conf.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git
More information about the debian-edu-commits
mailing list