[Pkg-openldap-devel] [openldap] 05/14: r426 at pulsar: torsten | 2005-02-25 19:26:30 +0100 Forgot to provide the config template, fixed. Removed a duplicate invoke-rc.d slapd stop as well.

[Timo Aaltonen]

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

tjaalton-guest pushed a commit to annotated tag 2.2.23-0.pre3
in repository openldap.

commit 979e8bef29d95cc0db5fb18038fa8bce40c0c883
Author: Torsten Landschoff <torsten at debian.org>
Date:   Fri Feb 25 23:13:39 2005 +0000

     r426 at pulsar:  torsten | 2005-02-25 19:26:30 +0100
     Forgot to provide the config template, fixed. Removed a duplicate
     invoke-rc.d slapd stop as well.
---
 debian/slapd.postinst |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/slapd.postinst b/debian/slapd.postinst
index c89326e..58cf5e1 100644
--- a/debian/slapd.postinst
+++ b/debian/slapd.postinst
@@ -85,12 +85,14 @@ create_new_configuration() {						# {{{
 	db_get slapd/backend
 	backend="`echo $RET|tr A-Z a-z`"
 
+	# Looks like the following code is not needed as slapd is unconfigured
+	# first and stopped at that time.
 	# Make sure the daemon is shut down when doing a reconfigure.  No
 	# daemon should be running during an initial install.
 	# XXX: Shouldn't we stop and start slapd at the outer level?
-	if [ "$1" = reconfigure ] || [ "$DEBCONF_RECONFIGURE" ]; then
-		invoke-rc.d slapd stop
-	fi
+	#if [ "$1" = reconfigure ] || [ "$DEBCONF_RECONFIGURE" ]; then
+	#	invoke-rc.d slapd stop
+	#fi
 
 	move_old_database_away /var/lib/ldap
 	create_new_slapd_conf "$basedn" "$backend"
@@ -106,7 +108,7 @@ create_new_slapd_conf() {						# {{{
 	basedn="$1"
 	backend="$2"
 	checkpoint=""
-	conf_template=""
+	conf_template="/usr/share/slapd/slapd.conf"
 
 	# Checkpoint if using the BDB backend
 	if [ "$backend" = "bdb" ]; then

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