[pkg-kolab] r1517 - in libkolab-perl/trunk/debian: . patches

[Mathieu Parent]

Author: sathieu
Date: 2010-09-14 07:02:30 +0000 (Tue, 14 Sep 2010)
New Revision: 1517

Modified:
   libkolab-perl/trunk/debian/changelog
   libkolab-perl/trunk/debian/patches/90-slapd-runtime-config.diff
Log:
Continue Fix "kolabd: kolab_bootstrap no longer works with slapd"

- also fix kolab_bootstrap
- use path from config



Modified: libkolab-perl/trunk/debian/changelog
===================================================================
--- libkolab-perl/trunk/debian/changelog	2010-09-14 06:04:18 UTC (rev 1516)
+++ libkolab-perl/trunk/debian/changelog	2010-09-14 07:02:30 UTC (rev 1517)
@@ -2,8 +2,10 @@
 
   * Fix "kolabd: kolab_bootstrap no longer works with slapd (version
     2.4.23)" by converting slapd.conf on the fly (Closes: #596710)
+    - lib: Kolab/Conf.pm
+    - sbin: kolab_bootstrap
 
- -- Mathieu Parent <sathieu at debian.org>  Mon, 13 Sep 2010 21:18:17 +0200
+ -- Mathieu Parent <sathieu at debian.org>  Tue, 14 Sep 2010 08:29:22 +0200
 
 libkolab-perl (1:2.2.4-20100624-1) unstable; urgency=low
 

Modified: libkolab-perl/trunk/debian/patches/90-slapd-runtime-config.diff
===================================================================
--- libkolab-perl/trunk/debian/patches/90-slapd-runtime-config.diff	2010-09-14 06:04:18 UTC (rev 1516)
+++ libkolab-perl/trunk/debian/patches/90-slapd-runtime-config.diff	2010-09-14 07:02:30 UTC (rev 1517)
@@ -10,7 +10,7 @@
 Index: libkolab-perl-2.2.4-20100624/lib/Kolab/Conf.pm
 ===================================================================
 --- libkolab-perl-2.2.4-20100624.orig/lib/Kolab/Conf.pm	2010-09-13 21:18:54.000000000 +0200
-+++ libkolab-perl-2.2.4-20100624/lib/Kolab/Conf.pm	2010-09-13 22:38:37.000000000 +0200
++++ libkolab-perl-2.2.4-20100624/lib/Kolab/Conf.pm	2010-09-14 08:28:22.000000000 +0200
 @@ -295,7 +295,7 @@
                  $haschanged{'saslauthd'} = 1;
              } elsif ($cfg =~ /apache/) {
@@ -29,14 +29,42 @@
 +        &Kolab::log('K', 'Stopping OpenLDAP...');
 +        system("invoke-rc.d slapd stop");
 +        &Kolab::log('K', 'Deleting old slapd config...');
-+        system("rm -rf /etc/ldap/slapd.d");
++        system("rm -rf $Kolab::config{'ldapserver_confdir'}/slapd.d");
 +        &Kolab::log('K', 'Converting slapd config...');
-+        system("mkdir /etc/ldap/slapd.d");
-+        system("slaptest -f /etc/ldap/slapd.conf -F /etc/ldap/slapd.d");
-+        system("chown -R openldap /etc/ldap/slapd.d");
-+        system("chgrp -R openldap /etc/ldap/slapd.d");
++        system("mkdir $Kolab::config{'ldapserver_confdir'}/slapd.d");
++        system("slaptest -f $Kolab::config{'ldapserver_confdir'}/slapd.conf -F $Kolab::config{'ldapserver_confdir'}/slapd.d");
++        system("chown -R openldap $Kolab::config{'ldapserver_confdir'}/slapd.d");
++        system("chgrp -R openldap $Kolab::config{'ldapserver_confdir'}/slapd.d");
 +        &Kolab::log('K', 'Starting OpenLDAP...');
 +        system("invoke-rc.d slapd start");
      }
  
      if ($haschanged{'saslauthd'}) {
+Index: libkolab-perl-2.2.4-20100624/sbin/kolab_bootstrap.in
+===================================================================
+--- libkolab-perl-2.2.4-20100624.orig/sbin/kolab_bootstrap.in	2010-09-14 08:13:09.000000000 +0200
++++ libkolab-perl-2.2.4-20100624/sbin/kolab_bootstrap.in	2010-09-14 08:27:09.000000000 +0200
+@@ -489,6 +489,14 @@
+       Kolab::Conf::bootstrapConfig();
+       $Kolab::config{"bootstrap_config"} = 'false';
+ 
++      print "Deleting old slapd config...\n";
++      system("rm -rf $Kolab::config{'ldapserver_confdir'}/slapd.d");
++      print "Converting slapd config...\n";
++      system("mkdir $Kolab::config{'ldapserver_confdir'}/slapd.d");
++      system("slaptest -f $Kolab::config{'ldapserver_confdir'}/slapd.conf -F $Kolab::config{'ldapserver_confdir'}/slapd.d");
++      system("chown -R openldap $Kolab::config{'ldapserver_confdir'}/slapd.d");
++      system("chgrp -R openldap $Kolab::config{'ldapserver_confdir'}/slapd.d");
++
+       #ldap server should access to certificate key
+       system("adduser --quiet $Kolab::config{'ldapserver_rusr'} $Kolab::config{'pki_grp'}");
+ 
+@@ -497,7 +505,7 @@
+       $ldap_uri = "ldap://127.0.0.1:389/";
+       # ensure that the database has correct permissions
+       system("chown $Kolab::config{'ldapserver_rusr'}:$Kolab::config{'ldapserver_grp'} $Kolab::config{'ldapserver_dir'}/*");
+-      (system("/usr/sbin/slapd -h ldap://127.0.0.1:389/ -f $Kolab::config{'ldapserver_confdir'}/slapd.conf -u $Kolab::config{'ldapserver_rusr'} -g $Kolab::config{'ldapserver_grp'}") == 0 ) || die( "Could not start temporary slapd: $!" );
++      (system("/usr/sbin/slapd -h ldap://127.0.0.1:389/ -F $Kolab::config{'ldapserver_confdir'}/slapd.d -u $Kolab::config{'ldapserver_rusr'} -g $Kolab::config{'ldapserver_grp'}") == 0 ) || die( "Could not start temporary slapd: $!" );
+       print ("Waiting for OpenLDAP to start\n");
+       sleep 10;
+