[pkg-kolab] r1596 - libkolab-perl/trunk/debian/patches

[Mathieu Parent]

Author: sathieu
Date: 2011-11-29 21:29:08 +0000 (Tue, 29 Nov 2011)
New Revision: 1596

Modified:
   libkolab-perl/trunk/debian/patches/30-bootstrap.diff
Log:
30-bootstrap.diff: also move /etc/ldap/slapd.d

Modified: libkolab-perl/trunk/debian/patches/30-bootstrap.diff
===================================================================
--- libkolab-perl/trunk/debian/patches/30-bootstrap.diff	2011-11-26 17:19:45 UTC (rev 1595)
+++ libkolab-perl/trunk/debian/patches/30-bootstrap.diff	2011-11-29 21:29:08 UTC (rev 1596)
@@ -6,9 +6,9 @@
 
 Index: libkolab-perl-2.3+git-20101212/sbin/kolab_bootstrap.in
 ===================================================================
---- libkolab-perl-2.3+git-20101212.orig/sbin/kolab_bootstrap.in	2011-11-25 22:01:39.000000000 +0100
-+++ libkolab-perl-2.3+git-20101212/sbin/kolab_bootstrap.in	2011-11-25 22:09:18.000000000 +0100
-@@ -376,6 +376,32 @@
+--- libkolab-perl-2.3+git-20101212.orig/sbin/kolab_bootstrap.in	2011-11-29 22:17:23.000000000 +0100
++++ libkolab-perl-2.3+git-20101212/sbin/kolab_bootstrap.in	2011-11-29 22:27:50.000000000 +0100
+@@ -376,6 +376,35 @@
  
  $Kolab::config{"is_master"} = $is_master;
  
@@ -35,13 +35,16 @@
 +  }
 +  undef $slapd;
 +  undef $slapd_orig;
++  if (-f "/etc/ldap/slapd.d") {
++    move("/etc/ldap/slapd.d", "/etc/ldap/slapd.d.orig");
++  }
 +}
 +
 +
  if ( $is_master eq "true" ) {
    ##### Master server setup
    getopt('f');
-@@ -465,6 +491,9 @@
+@@ -465,6 +494,9 @@
      }
    };
  
@@ -51,7 +54,7 @@
    my $confname = "$Kolab::config{'sasl_smtpconffile'}";
    copy("@CONFIG_DIR@/templates/smtpd.conf.template", $confname) || die "could not write to $confname";
  
-@@ -506,13 +535,16 @@
+@@ -506,13 +538,16 @@
          );
        $Kolab::config{"bootstrap_config"} = 'false';
  
@@ -69,7 +72,7 @@
        print ("Waiting for OpenLDAP to start\n");
        sleep 10;
  
-@@ -949,6 +981,9 @@
+@@ -949,6 +984,9 @@
    chmod 0600, $kolab_config;
  }