[pkg-kolab] r1514 - kolabd/trunk/debian
Mathieu Parent
sathieu at alioth.debian.org
Mon Sep 13 16:17:49 UTC 2010
Author: sathieu
Date: 2010-09-13 16:17:47 +0000 (Mon, 13 Sep 2010)
New Revision: 1514
Modified:
kolabd/trunk/debian/changelog
kolabd/trunk/debian/postinst
Log:
Revert "disabling slapd runtime configuration"
Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog 2010-09-10 07:31:05 UTC (rev 1513)
+++ kolabd/trunk/debian/changelog 2010-09-13 16:17:47 UTC (rev 1514)
@@ -1,3 +1,9 @@
+kolabd (2.2.4-20100624-3) unstable; urgency=low
+
+ * Revert "disabling slapd runtime configuration"
+
+ -- Mathieu Parent <sathieu at debian.org> Mon, 13 Sep 2010 18:18:40 +0200
+
kolabd (2.2.4-20100624-2) unstable; urgency=low
* Fix "kolab_bootstrap no longer works with slapd (version 2.4.23)"
Modified: kolabd/trunk/debian/postinst
===================================================================
--- kolabd/trunk/debian/postinst 2010-09-10 07:31:05 UTC (rev 1513)
+++ kolabd/trunk/debian/postinst 2010-09-13 16:17:47 UTC (rev 1514)
@@ -49,29 +49,12 @@
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#
More information about the pkg-kolab-devel
mailing list