marcus: server/kolabd/kolabd ChangeLog, 1.87, 1.88 kolab_bootstrap.in, 1.24, 1.25

cvs at kolab.org cvs at kolab.org
Sun Feb 11 15:47:53 CET 2007


Author: marcus

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv30514

Modified Files:
	ChangeLog kolab_bootstrap.in 
Log Message:

* dist_conf/suse, dist_conf/kolab/, dist_conf/common,
  dist_conf/gentoo: Added new variable TAR
* kolab_bootstrap.in: Added a condition to the slave setup so that
  it won't try to edit the @sysconfdir@/rc.conf file if kolabd was built
  with --without-openpkg

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- ChangeLog	6 Feb 2007 14:53:43 -0000	1.87
+++ ChangeLog	11 Feb 2007 14:47:51 -0000	1.88
@@ -1,3 +1,10 @@
+2007-02-11 Marcus Hüwe <suse-tux at gmx.de>
+	* dist_conf/suse, dist_conf/kolab/, dist_conf/common,
+	  dist_conf/gentoo: Added new variable TAR
+	* kolab_bootstrap.in: Added a condition to the slave setup so that
+	  it won't try to edit the "@sysconfdir@/rc.conf" file if kolabd was built
+	  with "--without-openpkg"
+
 2007-01-08 Richard Bos <richard at radoeka.nl>
 	* templates/resmgr.conf.template.in: fix the path to the freebusy
 	  directory

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- kolab_bootstrap.in	10 Nov 2006 18:06:20 -0000	1.24
+++ kolab_bootstrap.in	11 Feb 2007 14:47:51 -0000	1.25
@@ -840,23 +840,27 @@
 of kolabhosts on the master before proceeding.
 EOS
   kolab_system("ssh -CA $master_host @KOLABRC@ rc @LDAPD@ stop");
-  kolab_system("ssh -CA $master_host @libdir@/openpkg/tar -C @ldapserver_statedir@ -pcf - openldap-data | @libdir@/openpkg/tar -C @ldapserver_statedir@ -pxf -");
+  kolab_system("ssh -CA $master_host @TAR@ -C @ldapserver_statedir@ -pcf - openldap-data | @TAR@ -C @ldapserver_statedir@ -pxf -");
   kolab_system("ssh -CA $master_host @KOLABRC@ rc @LDAPD@ start");
 
-  print "Updating configuration, please ignore any initial errors from kolabconf\n\n";
-  my $cfg;
-  open(FH, "<@sysconfdir@/rc.conf") || die;
-  $cfg .= $_ while (<FH>);
-  close(FH);
-  
-  $cfg =~ s/\n((openldap_url|sasl_authmech|openldap_enable)\S*=[^\n]*)/#$1\n/sg;
-  # $cfg .= "openldap_enable=\"no\"\nopenldap_url=\"\"\nsasl_authmech=\"ldap\"\n";
-  $cfg .= "\nopenldap_url=\"ldap:// ldaps://\"\nsasl_authmech=\"ldap\"\n";
-  
-  open(FH, ">@sysconfdir@/rc.conf") || die;
-  print FH $cfg;
-  close(FH);
-  undef $cfg;
+  # 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.
+  if ("@WITHOPENPKG@" eq "yes") {
+    print "Updating configuration, please ignore any initial errors from kolabconf\n\n";
+    my $cfg;
+    open(FH, "<@sysconfdir@/rc.conf") || die;
+    $cfg .= $_ while (<FH>);
+    close(FH);
+    
+    $cfg =~ s/\n((openldap_url|sasl_authmech|openldap_enable)\S*=[^\n]*)/#$1\n/sg;
+    # $cfg .= "openldap_enable=\"no\"\nopenldap_url=\"\"\nsasl_authmech=\"ldap\"\n";
+    $cfg .= "\nopenldap_url=\"ldap:// ldaps://\"\nsasl_authmech=\"ldap\"\n";
+    
+    open(FH, ">@sysconfdir@/rc.conf") || die;
+    print FH $cfg;
+    close(FH);
+    undef $cfg;
+  }
   
   print <<'EOS';
 If you chose to create a CA on the master server, you will now need to create





More information about the commits mailing list