[pkg-kolab] r1004 - in kolabd/trunk/debian: . patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-11-21 21:58:09 +0000 (Fri, 21 Nov 2008)
New Revision: 1004

Modified:
   kolabd/trunk/debian/changelog
   kolabd/trunk/debian/patches/30-bootstrap.diff
Log:
bootstrap.diff: moved sasl configuration from master-only to master and
slave part 



Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog	2008-11-18 18:20:46 UTC (rev 1003)
+++ kolabd/trunk/debian/changelog	2008-11-21 21:58:09 UTC (rev 1004)
@@ -9,9 +9,11 @@
   * debian/rules, debian/patches/90-slapd-template.diff, debian/dirs:
     move LDAP schemas to /etc/ldap/schema 
   * debian/patches/30-bootstrap.diff, debian/dirs: Create /var/backups/kolab
-    on package installation. Reduce the bootstrap patch.
+    on package installation. Reduce the bootstrap patch
+  * 30-bootstrap.diff: moved sasl configuration from master-only to master and
+    slave part 
 
- -- Mathieu Parent <math.parent at gmail.com>  Tue, 18 Nov 2008 19:17:25 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Fri, 21 Nov 2008 22:54:03 +0100
 
 kolabd (2.2.0-20080709.dfsg-1) unstable; urgency=low
 

Modified: kolabd/trunk/debian/patches/30-bootstrap.diff
===================================================================
--- kolabd/trunk/debian/patches/30-bootstrap.diff	2008-11-18 18:20:46 UTC (rev 1003)
+++ kolabd/trunk/debian/patches/30-bootstrap.diff	2008-11-21 21:58:09 UTC (rev 1004)
@@ -8,7 +8,7 @@
 ===================================================================
 --- a/kolab_bootstrap.in
 +++ b/kolab_bootstrap.in
-@@ -69,7 +70,7 @@
+@@ -69,7 +69,7 @@
      print ("Error: Found $name running on Port $port\n");
      print ("Check your installation!\n");
      print ("You must stop the service $name before running Kolab\n");
@@ -17,7 +17,7 @@
      exit 1;
    }
  }
-@@ -181,7 +182,7 @@
+@@ -181,7 +181,7 @@
  
  print ("Excellent all required Ports are available!\n");
  
@@ -26,7 +26,26 @@
  if ($?==0) {
    print ("\nFound existing configuration\n");
    print "\nBootstrapping Kolab will overwrite old configuration\n";
-@@ -375,8 +376,23 @@
+@@ -286,6 +286,18 @@
+   print "Proceeding with master server setup\n\n";
+ }
+ 
++# enable saslauthd by default
++copy("/etc/default/saslauthd", "/etc/default/saslauthd.orig") || die "could not read /etc/default/saslauthd.orig";
++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";
++foreach (<$saslauthd_orig>) {
++  s/^(# )?START=.*$/START=yes/g;
++  s/^MECHANISMS="pam"/MECHANISMS="ldap"/g;
++      print $saslauthd $_;
++}
++undef $saslauthd;
++undef $saslauthd_orig;
++
+ if ( $is_master eq "true" ) {
+   ##### Master server setup
+   getopt('f');
+@@ -375,6 +387,9 @@
    };
  
    my $confname = "@sasl_smtpconffile@";
@@ -35,22 +54,8 @@
 +  }
    copy("@sysconfdir@/kolab/templates/smtpd.conf.template", $confname) || die "could not write to $confname";
  
-+  # enable saslauthd by default
-+  copy("/etc/default/saslauthd", "/etc/default/saslauthd.orig") || die "could not read /etc/default/saslauthd.orig";
-+  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";
-+  foreach (<$saslauthd_orig>) {
-+    s/^(# )?START=.*$/START=yes/g;
-+    s/^MECHANISMS="pam"/MECHANISMS="ldap"/g;
-+        print $saslauthd $_;
-+  }
-+  undef $saslauthd;
-+  undef $saslauthd_orig;
-+
    getopts('b');
- 
-   if ($opt_b) {
-@@ -418,6 +434,7 @@
+@@ -418,6 +433,7 @@
        undef $slpd;
        undef $tmpl;
        kolab_chown "@ldapserver_usr@","@ldapserver_grp@","@ldapserver_confdir@/slapd.conf";
@@ -58,7 +63,7 @@
        
        my $tmplname = "@sysconfdir@/kolab/templates/slapd.replicas.template";
        $confname = "@ldapserver_confdir@/slapd.replicas";
-@@ -466,7 +483,7 @@
+@@ -466,7 +482,7 @@
        $ldap_uri = "ldap://127.0.0.1:389/";
        # ensure that the database has correct permissions
        system("chown @ldapserver_rusr@:@ldapserver_grp@ @ldapserver_dir@/*");
@@ -67,7 +72,7 @@
        print ("Waiting for OpenLDAP to start\n");
        sleep 10;
  
-@@ -632,7 +649,7 @@
+@@ -632,7 +648,7 @@
  
     if ($ldap_uri =~ /127\.0\.0\.1/ || $ldap_uri =~ /localhost/) {
        print "\nkill temporary slapd\n\n";
@@ -76,7 +81,7 @@
        sleep 1; # actually race should be impossible
        system("killall -9 slapd >/dev/null 2>&1");
     }
-@@ -680,7 +697,7 @@
+@@ -680,7 +696,7 @@
    ##### Slave server setup
  
    print "stop running slapd (if any)\n";
@@ -85,7 +90,7 @@
  
    # Make sure that no rogue demons are running
    tryConnect( '127.0.0.1', 389 ) && die "A process is already listening to port 389 (ldap)\n"
-@@ -800,9 +817,9 @@
+@@ -800,9 +816,9 @@
  is copied over to this slave. Please make sure that this slave is entered into the list 
  of kolabhosts on the master before proceeding.
  EOS
@@ -97,7 +102,7 @@
  
    # FIXME: we should get rid of this construct because it makes the code hard to read.
    #        A if (-e @sysconfdir@/rc.conf) statement should be enough.
-@@ -869,6 +886,8 @@
+@@ -869,6 +885,8 @@
    }
  
    kolab_system("@sbindir@/kolabconf -n");
@@ -106,7 +111,7 @@
  
    $fd = IO::File->new($kolab_config, "w+") || die "could not open $kolab_config";
    print $fd "fqdnhostname : $fqdn\n";
-@@ -891,6 +910,6 @@
+@@ -891,6 +909,6 @@
  
  #system("@sysconfdir@/kolab/kolab_sslcert.sh $fqdn");
  print "kolab is now ready to run!\n";