[pkg-kolab] r1511 - kolabd/trunk/debian

[Mathieu Parent]

Author: sathieu
Date: 2010-09-09 22:01:31 +0000 (Thu, 09 Sep 2010)
New Revision: 1511

Modified:
   kolabd/trunk/debian/changelog
   kolabd/trunk/debian/postinst
Log:
Fix "kolab_bootstrap no longer works with slapd (version 2.4.23)"

by disabling slapd runtime configuration (Closes: #595539)


Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog	2010-07-05 22:40:39 UTC (rev 1510)
+++ kolabd/trunk/debian/changelog	2010-09-09 22:01:31 UTC (rev 1511)
@@ -1,3 +1,10 @@
+kolabd (2.2.4-20100624-2) unstable; urgency=low
+
+  * Fix "kolab_bootstrap no longer works with slapd (version 2.4.23)"
+    by disabling slapd runtime configuration (Closes: #595539)
+
+ -- Mathieu Parent <sathieu at debian.org>  Fri, 10 Sep 2010 00:02:49 +0200
+
 kolabd (2.2.4-20100624-1) unstable; urgency=low
 
   * New upstream release (2.2.4-20100624)

Modified: kolabd/trunk/debian/postinst
===================================================================
--- kolabd/trunk/debian/postinst	2010-07-05 22:40:39 UTC (rev 1510)
+++ kolabd/trunk/debian/postinst	2010-09-09 22:01:31 UTC (rev 1511)
@@ -49,12 +49,29 @@
 	fi
 }
 
+slapd_no_runtime_conf() {
+	# Disable runtime configuration only if kolab manages slapd
+	if [ -e "/etc/kolab/templates/slapd.conf.template" ]; then
+		grep -q 'SLAPD_CONF=""' /etc/default/slapd  || {
+			# TODO: Now we are doing something that is not allowed
+			# by policy but it has to be done. Actually, this is
+			# slapd's fault (see #595539).
+			echo "Disabling slapd runtime configuration"
+			sed -i -e "s|^SLAPD_CONF=.*|SLAPD_CONF=\"\"|" /etc/default/slapd
+			# Only run kolabconf if system is already bootstrapped
+			if [ -e /etc/kolab/kolab.conf ]; then
+				kolabconf
+			fi
+		}
+	fi
+}
 if [ "$1" = configure ]; then
 	add_kolab_system_users
 	adduser_postfix_in_sasl
 	adduser_cyrus_in_kolab
 	fixperms
 	configure_apache
+	slapd_no_runtime_conf
 fi
 
 #DEBHELPER#