richard: server/kolabd/kolabd ChangeLog, 1.180, 1.181 kolab_bootstrap.in, 1.38, 1.39

[cvs at kolab.org]

Author: richard

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

Modified Files:
	ChangeLog kolab_bootstrap.in 
Log Message:
added syncrepl support



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -d -r1.180 -r1.181
--- ChangeLog	5 Aug 2008 20:41:11 -0000	1.180
+++ ChangeLog	11 Aug 2008 19:22:55 -0000	1.181
@@ -1,3 +1,7 @@
+2008-08-11 Richard Bos <richard at radoeka.nl>
+
+	* kolab_bootstrap.in: added syncrepl support
+
 2008-08-04 Richard Bos <richard at radoeka.nl>
 
 	* templates/slapd.conf.template.in: removed obsolete variable

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- kolab_bootstrap.in	19 Jul 2008 07:21:52 -0000	1.38
+++ kolab_bootstrap.in	11 Aug 2008 19:22:55 -0000	1.39
@@ -794,14 +794,16 @@
   chmod 0600, $kolab_config;
   kolab_chown "@kolab_musr@","@kolab_mgrp@",$kolab_config;
 
-  print << 'EOS';
+  if ($kolab_config{'directory_mode'} ne "syncrepl" ) {
+    print << 'EOS';
 Now the master server needs to be stopped briefly while the contents of the LDAP database
 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
-  kolab_system("ssh -CA $master_host @KOLABRC@ rc @LDAPD@ stop");
-  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");
+    kolab_system("ssh -CA $master_host @KOLABRC@ rc @LDAPD@ stop");
+    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");
+  }
 
   # 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.