X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fdata%2Fslapd-glue-syncrepl1.conf;h=beeb561cf9b3d291d8aaf098cc04b368398d1b1d;hb=f980c64cb63abca0928e176a9443d8513b74ef74;hp=3cf5908e204738f0578d891a5bb4d808e3269410;hpb=25b15e0014780accc252c64d0499a8d64d210cfa;p=openldap

diff --git a/tests/data/slapd-glue-syncrepl1.conf b/tests/data/slapd-glue-syncrepl1.conf
index 3cf5908e20..beeb561cf9 100644
--- a/tests/data/slapd-glue-syncrepl1.conf
+++ b/tests/data/slapd-glue-syncrepl1.conf
@@ -1,9 +1,8 @@
 # stand-alone slapd config -- for backglue testing (with indexing)
-# $OpenLDAP: pkg/ldap/tests/data/slapd-glue.conf,v 1.5.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-2012 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -14,19 +13,19 @@
 ## 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
-pidfile		./testrun/slapd.1.pid
-argsfile	./testrun/slapd.1.args
+include		@SCHEMADIR@/core.schema
+include		@SCHEMADIR@/cosine.schema
+include		@SCHEMADIR@/inetorgperson.schema
+include		@SCHEMADIR@/openldap.schema
+include		@SCHEMADIR@/nis.schema
+pidfile		@TESTDIR@/slapd.1.pid
+argsfile	@TESTDIR@/slapd.1.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
 #monitormod#modulepath ../servers/slapd/back-monitor/
 #monitormod#moduleload back_monitor.la
-#gluemod#moduleload ../servers/slapd/overlays/glue.la
+#syncprovmod#moduleload ../servers/slapd/overlays/syncprov.la
 
 #######################################################################
 # database definitions
@@ -34,30 +33,30 @@ argsfile	./testrun/slapd.1.args
 
 database	@BACKEND@
 suffix		"ou=Information Technology Division,ou=People,dc=example,dc=com"
-directory	./testrun/db.1.a
+subordinate
 rootdn		"cn=Manager 1,dc=example,dc=com"
-#ldbm#index		objectclass	eq
-#ldbm#index		uid	pres,eq,sub
-#ldbm#index		cn,sn	pres,eq,sub,subany
-#ldbm#dbnosync
-#ldbm#dbnolocking
-#bdb#index		objectclass	eq
-#bdb#index		uid	pres,eq,sub
-#bdb#index		cn,sn	pres,eq,sub,subany
+#~null~#directory	@TESTDIR@/db.1.a
+#indexdb#index		objectclass	eq
+#indexdb#index		uid	pres,eq,sub
+#indexdb#index		cn,sn	pres,eq,sub,subany
+#indexdb#index		entryUUID,entryCSN	pres
+#ndb#dbname db_1
+#ndb#include @DATADIR@/ndb.conf
+
 overlay		syncprov
 
 database	@BACKEND@
 suffix		"ou=Groups,dc=example,dc=com"
-directory	./testrun/db.1.b
+subordinate
 rootdn		"cn=Manager 1,dc=example,dc=com"
-#ldbm#index		objectclass	eq
-#ldbm#index		uid	pres,eq,sub
-#ldbm#index		cn,sn	pres,eq,sub,subany
-#ldbm#dbnosync
-#ldbm#dbnolocking
-#bdb#index		objectclass	eq
-#bdb#index		uid	pres,eq,sub
-#bdb#index		cn,sn	pres,eq,sub,subany
+#~null~#directory	@TESTDIR@/db.1.b
+#indexdb#index		objectclass	eq
+#indexdb#index		uid	pres,eq,sub
+#indexdb#index		cn,sn	pres,eq,sub,subany
+#indexdb#index		entryUUID,entryCSN	pres
+#ndb#dbname db_2
+#ndb#include @DATADIR@/ndb.conf
+
 syncrepl	rid=1
 		provider=@URI2@
 		binddn="cn=Manager 2,dc=example,dc=com"
@@ -69,27 +68,22 @@ syncrepl	rid=1
 		schemachecking=off
 		scope=sub
 		type=refreshAndPersist
-		retry="10 3 300 5"
+		retry="3 10 300 5"
 updateref	@URI2@
-overlay		syncprov
+#overlay		syncprov
 
 
 database	@BACKEND@
 suffix		"dc=example,dc=com"
-directory	./testrun/db.1.c
 rootdn		"cn=Manager 1,dc=example,dc=com"
 rootpw		secret
-#ldbm#index		objectclass	eq
-#ldbm#index		uid	pres,eq,sub
-#ldbm#index		cn,sn	pres,eq,sub,subany
-#ldbm#dbnosync
-#ldbm#dbnolocking
-#bdb#index		objectclass	eq
-#bdb#index		uid	pres,eq,sub
-#bdb#index		cn,sn	pres,eq,sub,subany
-overlay		syncprov
-overlay		glue
-glue-sub	"ou=Information Technology Division,ou=People,dc=example,dc=com"
-glue-sub	"ou=Groups,dc=example,dc=com"
+#~null~#directory	@TESTDIR@/db.1.c
+#indexdb#index		objectclass	eq
+#indexdb#index		uid	pres,eq,sub
+#indexdb#index		cn,sn	pres,eq,sub,subany
+#ndb#dbname db_3
+#ndb#include @DATADIR@/ndb.conf
+
+#overlay		syncprov
 
 #monitor#database	monitor