[debian-edu-commits] debian-edu/ 01/01: Remove workaround for bug #585966 in init.d/fetch-ldap-cert, now that we no longer use pdns.

[Petter Reinholdtsen]

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

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

commit 6662d8a385d545067bd0bddc6f65553db9018d56
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Mon Mar 28 13:31:35 2016 +0000

    Remove workaround for bug #585966 in init.d/fetch-ldap-cert, now that we no longer use pdns.
---
 debian/changelog                         | 2 ++
 debian/debian-edu-config.fetch-ldap-cert | 6 ------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d413fd9..04e7840 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ debian-edu-config (1.819) UNRELEASED; urgency=low
   * Translation updates:
     - Updated Brazilian Portuguese translation for debconf questions
       (Closes: #785467).  Translated by Adriano Rafael Gomes.
+  * Remove workaround for bug #585966 in init.d/fetch-ldap-cert, now
+    that we no longer use pdns.
 
   [ Mike Gabriel ]
   * Add quotes around DNs when evoking kadmin.local in gosa-create and
diff --git a/debian/debian-edu-config.fetch-ldap-cert b/debian/debian-edu-config.fetch-ldap-cert
index 3b03848..4ba6ab8 100644
--- a/debian/debian-edu-config.fetch-ldap-cert
+++ b/debian/debian-edu-config.fetch-ldap-cert
@@ -23,12 +23,6 @@ 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() {
     # Locate LDAP server
     LDAPSERVER=$(debian-edu-ldapserver)

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