[pkg-kolab] r876 - in kolabd/branches/2.2/debian: . patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-05-26 17:28:08 +0000 (Mon, 26 May 2008)
New Revision: 876

Modified:
   kolabd/branches/2.2/debian/changelog
   kolabd/branches/2.2/debian/patches/30-bootstrap.dpatch
Log:
updated patch 30-bootstrap to run newaliases at the end of kolab_bootstrap


Modified: kolabd/branches/2.2/debian/changelog
===================================================================
--- kolabd/branches/2.2/debian/changelog	2008-05-25 15:25:44 UTC (rev 875)
+++ kolabd/branches/2.2/debian/changelog	2008-05-26 17:28:08 UTC (rev 876)
@@ -12,6 +12,7 @@
     - use FDS LDAP backend for persistent searches
     - smarty has now the good path
     - mostly integrated upstream
+  * updated patch 30-bootstrap to run newaliases at the end of kolab_bootstrap
   * new patch 40-disable-amavis: amavis is suggested, so disabled as default
   * new patch 50-postfix-hashes: Postfix hashes templates
     - Added RUNONCHANGE=/usr/sbin/postmap -o @emailserver_confdir@/... so that 
@@ -32,7 +33,7 @@
     http://lists.debian.org/debian-legal/2008/04/msg00087.html
   * debian/postinst: add user cyrus to group kolab. This is needed for PKI.
 
- -- Mathieu Parent <math.parent at gmail.com>  Sun, 25 May 2008 16:39:14 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Mon, 26 May 2008 19:27:46 +0200
 
 kolabd (2.1.0-20070510.dfsg-3) unstable; urgency=low
 

Modified: kolabd/branches/2.2/debian/patches/30-bootstrap.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/30-bootstrap.dpatch	2008-05-25 15:25:44 UTC (rev 875)
+++ kolabd/branches/2.2/debian/patches/30-bootstrap.dpatch	2008-05-26 17:28:08 UTC (rev 876)
@@ -4,9 +4,9 @@
 ## DP: Fixups for Debian
 
 @DPATCH@
-diff -urNad kolabd-2.1.0-20070510.dfsg~/kolab_bootstrap.in kolabd-2.1.0-20070510.dfsg/kolab_bootstrap.in
---- kolabd-2.1.0-20070510.dfsg~/kolab_bootstrap.in	2007-02-11 15:47:51.000000000 +0100
-+++ kolabd-2.1.0-20070510.dfsg/kolab_bootstrap.in	2007-07-30 13:44:24.000000000 +0200
+diff -urNad kolabd-2.1.99-20080521.dfsg~/kolab_bootstrap.in kolabd-2.1.99-20080521.dfsg/kolab_bootstrap.in
+--- kolabd-2.1.99-20080521.dfsg~/kolab_bootstrap.in	2008-05-26 19:18:22.000000000 +0200
++++ kolabd-2.1.99-20080521.dfsg/kolab_bootstrap.in	2008-05-26 19:21:49.000000000 +0200
 @@ -21,6 +21,7 @@
  use Net::LDAP::Entry;
  use Net::Netmask;
@@ -64,7 +64,7 @@
  
    print "creating backup of LDAP repository\n";
    system("cp -pRP \"@ldapserver_dir@\" \"$backupdir/openldap-data\"");
-@@ -396,8 +397,23 @@
+@@ -398,8 +399,23 @@
    };
  
    my $confname = "@sasl_smtpconffile@";
@@ -88,7 +88,7 @@
    getopts('b');
  
    if ($opt_b) {
-@@ -437,6 +453,7 @@
+@@ -441,6 +457,7 @@
        undef $slpd;
        undef $tmpl;
        kolab_chown "@ldapserver_usr@","@ldapserver_grp@","@ldapserver_confdir@/slapd.conf";
@@ -96,7 +96,7 @@
        
        my $tmplname = "@sysconfdir@/kolab/templates/slapd.replicas.template";
        $confname = "@ldapserver_confdir@/slapd.replicas";
-@@ -485,7 +502,7 @@
+@@ -489,7 +506,7 @@
        $ldap_uri = "ldap://127.0.0.1:389/";
        # ensure that the database has correct permissions
        system("chown @ldapserver_rusr@:@ldapserver_grp@ @ldapserver_dir@/*");
@@ -105,7 +105,7 @@
        print ("Waiting for OpenLDAP to start\n");
        sleep 10;
  
-@@ -654,7 +671,7 @@
+@@ -655,7 +672,7 @@
  
     if ($ldap_uri =~ /127\.0\.0\.1/ || $ldap_uri =~ /localhost/) {
        print "\nkill temporary slapd\n\n";
@@ -114,7 +114,7 @@
        sleep 1; # actually race should be impossible
        system("killall -9 slapd >/dev/null 2>&1");
     }
-@@ -721,7 +738,7 @@
+@@ -703,7 +720,7 @@
    ##### Slave server setup
  
    print "stop running slapd (if any)\n";
@@ -123,7 +123,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"
-@@ -839,9 +856,9 @@
+@@ -823,9 +840,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
@@ -135,11 +135,20 @@
  
    # 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.
-@@ -939,6 +956,6 @@
+@@ -892,6 +909,8 @@
+   }
  
+   kolab_system("@sbindir@/kolabconf -n");
++  #run postfix newaliases
++  kolab_system("@sbindir@/newaliases");
+ 
+   $fd = IO::File->new($kolab_config, "w+") || die "could not open $kolab_config";
+   print $fd "fqdnhostname : $fqdn\n";
+@@ -914,6 +933,6 @@
+ 
  #system("@sysconfdir@/kolab/kolab_sslcert.sh $fqdn");
  print "kolab is now ready to run!\n";
 -print "please run '@KOLABRC@ rc all start'\n";
 +print "please restart all the daemons\n";
  print ("Use login=manager and passwd=$bind_pw when you log into\n");
- print ("the webinterface https://$fqdn@webserver_web_prefix@/admin !\n");
+ print ("the webinterface https://$fqdn@kolab_wui@ !\n");