Merge remote branch 'origin/mdb.master'

[openldap] / tests / data / slapd-syncrepl-slave-persist1.conf

diff --git a/tests/data/slapd-syncrepl-slave-persist1.conf b/tests/data/slapd-syncrepl-slave-persist1.conf
index 9caae200af3f49e26558cd5ca90758886f06efee..2a0571731503650ec0adbf453c1dbc3dae5cd9b5 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-persist1.conf
+++ b/tests/data/slapd-syncrepl-slave-persist1.conf
@@ -1,9 +1,8 @@
 # slave slapd config -- for testing of SYNC replication
-# $OpenLDAP: pkg/ldap/tests/data/slapd-syncrepl-slave-persist1.conf,v 1.4.2.4 
- 2003/12/15 22:05:29 kurt Exp $
+# $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2005 The OpenLDAP Foundation.
+## Copyright 1998-2011 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -14,14 +13,14 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
-include ./schema/core.schema
-include ./schema/cosine.schema
-include ./schema/inetorgperson.schema
-include ./schema/openldap.schema
-include ./schema/nis.schema
+include                @SCHEMADIR@/core.schema
+include                @SCHEMADIR@/cosine.schema
+include                @SCHEMADIR@/inetorgperson.schema
+include                @SCHEMADIR@/openldap.schema
+include                @SCHEMADIR@/nis.schema
 #
-pidfile     ./testrun/slapd.4.pid
-argsfile    ./testrun/slapd.4.args
+pidfile                @TESTDIR@/slapd.4.pid
+argsfile       @TESTDIR@/slapd.4.args
 
 #mod#modulepath        ../servers/slapd/back-@BACKEND@/
 #mod#moduleload        back_@BACKEND@.la
@@ -45,15 +44,15 @@ argsfile    ./testrun/slapd.4.args
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      ./testrun/db.4.a
 rootdn         "cn=Replica,dc=example,dc=com"
 rootpw         secret
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
-#ldbm#index            objectClass     eq
-#ldbm#index            cn,sn,uid       pres,eq,sub
+#null#bind             on
+#~null~#directory      @TESTDIR@/db.4.a
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
+#indexdb#index         entryUUID,entryCSN      eq
+#ndb#dbname db_4
+#ndb#include @DATADIR@/ndb.conf
 
 # Don't change syncrepl spec yet
 syncrepl       rid=1
@@ -67,6 +66,7 @@ syncrepl      rid=1
                schemachecking=off
                scope=sub
                type=refreshAndPersist
+               retry="3 5 300 5"
 updateref      @URI1@
 
 overlay                syncprov