richard: server/kolabd/kolabd/templates slapd.conf.template.in, 1.23, 1.24

[cvs at kolab.org]

Author: richard

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

Modified Files:
	slapd.conf.template.in 
Log Message:
reshuffled the configuration a bit, otherwise slapd won't start if
directory_mode : syncrepl is set in kolab.conf.  See kolab/isse1755



Index: slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- slapd.conf.template.in	10 Sep 2008 20:02:05 -0000	1.23
+++ slapd.conf.template.in	10 Sep 2008 20:48:20 -0000	1.24
@@ -27,14 +27,11 @@
 argsfile	@ldapserver_argsfile@
 
 @@@if directory_replication_mode_is_syncrepl@@@
-# Use syncprov/syncrepl method for ldap replication
-moduleload syncprov
-overlay syncprov
-syncprov-checkpoint 1024 16
-syncprov-sessionlog 4096
-syncprov-reloadhint TRUE
-index entryCSN eq
-index entryUUID eq
+# Depending on the build options of openldap the syncprov module is statically
+# or dynamically build.  When build dynamically the module must be loaded.
+# As the slapd that comes with the openpkg version of kolab is statically
+# build it is not necessary to load the module.
+# moduleload syncprov
 @@@else@@@
 replica-pidfile	@ldapserverslurpd_pidfile@
 replogfile      @ldapserver_replogfile@
@@ -65,6 +62,16 @@
 # The idletimeout can be increased if some clients develop problems.
 # Please report to kolab-devel at kolab.org if you encounter such a client.
 idletimeout	300
+
+@@@if directory_replication_mode_is_syncrepl@@@
+# Use syncprov/syncrepl method for ldap replication
+overlay syncprov
+syncprov-checkpoint 1024 16
+syncprov-sessionlog 4096
+syncprov-reloadhint TRUE
+index entryCSN eq
+index entryUUID eq
+@@@endif@@@
 
 dirtyread