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

[Mathieu Parent]

Author: sathieu
Date: 2011-11-25 21:13:01 +0000 (Fri, 25 Nov 2011)
New Revision: 1590

Modified:
   libkolab-perl/trunk/debian/changelog
   libkolab-perl/trunk/debian/patches/30-bootstrap.diff
Log:
30-bootstrap.diff: Force slapd to use slapd.conf instead of cn=config

Modified: libkolab-perl/trunk/debian/changelog
===================================================================
--- libkolab-perl/trunk/debian/changelog	2011-11-21 22:41:25 UTC (rev 1589)
+++ libkolab-perl/trunk/debian/changelog	2011-11-25 21:13:01 UTC (rev 1590)
@@ -14,6 +14,7 @@
   * Moved to debhelper compat level 8 and dh
   * 99-sha1-to-sha.diff: Convert usage of Digest::SHA1 to Digest::SHA
     (Closes: #640153)
+  * 30-bootstrap.diff: Force slapd to use slapd.conf instead of cn=config
 
  -- Mathieu Parent <sathieu at debian.org>  Tue, 24 May 2011 22:27:18 +0200
 

Modified: libkolab-perl/trunk/debian/patches/30-bootstrap.diff
===================================================================
--- libkolab-perl/trunk/debian/patches/30-bootstrap.diff	2011-11-21 22:41:25 UTC (rev 1589)
+++ libkolab-perl/trunk/debian/patches/30-bootstrap.diff	2011-11-25 21:13:01 UTC (rev 1590)
@@ -6,16 +6,16 @@
 
 Index: libkolab-perl-2.3+git-20101212/sbin/kolab_bootstrap.in
 ===================================================================
---- libkolab-perl-2.3+git-20101212.orig/sbin/kolab_bootstrap.in	2010-11-25 10:42:40.000000000 +0100
-+++ libkolab-perl-2.3+git-20101212/sbin/kolab_bootstrap.in	2011-05-24 23:43:34.000000000 +0200
-@@ -376,6 +376,18 @@
+--- 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 @@
  
  $Kolab::config{"is_master"} = $is_master;
  
 +# enable saslauthd by default
-+copy("/etc/default/saslauthd", "/etc/default/saslauthd.orig") || die "could not read /etc/default/saslauthd.orig";
++copy("/etc/default/saslauthd", "/etc/default/saslauthd.orig") || die "could not backup /etc/default/saslauthd";
 +my $saslauthd_orig = IO::File->new("/etc/default/saslauthd.orig", "r") || die "could not read /etc/default/saslauthd.orig";
-+my $saslauthd = IO::File->new("/etc/default/saslauthd", "w") || die "could not read /etc/default/saslauthd";
++my $saslauthd = IO::File->new("/etc/default/saslauthd", "w") || die "could not open /etc/default/saslauthd";
 +foreach (<$saslauthd_orig>) {
 +  s/^(# )?START=.*$/START=yes/g;
 +  s/^MECHANISMS="pam"/MECHANISMS="ldap"/g;
@@ -24,10 +24,24 @@
 +undef $saslauthd;
 +undef $saslauthd_orig;
 +
++# Use slapd.conf instead of cn=config
++if (-f "/etc/default/slapd") {
++  copy("/etc/default/slapd", "/etc/default/slapd.orig") || die "could not backup /etc/default/slapd";
++  my $slapd_orig = IO::File->new("/etc/default/slapd.orig", "r") || die "could not read /etc/default/slapd.orig";
++  my $slapd = IO::File->new("/etc/default/slapd", "w") || die "could not open /etc/default/slapd";
++  foreach (<$slapd_orig>) {
++    s@^(# )?SLAPD_CONF=.*$@SLAPD_CONF=/etc/ldap/slapd.conf at g;
++    print $slapd $_;
++  }
++  undef $slapd;
++  undef $slapd_orig;
++}
++
++
  if ( $is_master eq "true" ) {
    ##### Master server setup
    getopt('f');
-@@ -465,6 +477,9 @@
+@@ -465,6 +491,9 @@
      }
    };
  
@@ -37,7 +51,7 @@
    my $confname = "$Kolab::config{'sasl_smtpconffile'}";
    copy("@CONFIG_DIR@/templates/smtpd.conf.template", $confname) || die "could not write to $confname";
  
-@@ -506,13 +521,16 @@
+@@ -506,13 +535,16 @@
          );
        $Kolab::config{"bootstrap_config"} = 'false';
  
@@ -55,7 +69,7 @@
        print ("Waiting for OpenLDAP to start\n");
        sleep 10;
  
-@@ -949,6 +967,9 @@
+@@ -949,6 +981,9 @@
    chmod 0600, $kolab_config;
  }