happy new year

[openldap] / tests / data / slapd-glue-syncrepl2.conf

diff --git a/tests/data/slapd-glue-syncrepl2.conf b/tests/data/slapd-glue-syncrepl2.conf
index 11042ae2a059133d715065f463dff330f0ca90f5..e84ac49add6d76e2d13e581964376926039aa8bf 100644 (file)
--- a/tests/data/slapd-glue-syncrepl2.conf
+++ b/tests/data/slapd-glue-syncrepl2.conf
@@ -3,7 +3,7 @@
   kurt Exp $
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2005 The OpenLDAP Foundation.
+## Copyright 1998-2007 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -14,19 +14,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.2.pid
-argsfile       ./testrun/slapd.2.args
+include                @SCHEMADIR@/core.schema
+include                @SCHEMADIR@/cosine.schema
+include                @SCHEMADIR@/inetorgperson.schema
+include                @SCHEMADIR@/openldap.schema
+include                @SCHEMADIR@/nis.schema
+pidfile                @TESTDIR@/slapd.2.pid
+argsfile       @TESTDIR@/slapd.2.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,7 +34,8 @@ argsfile      ./testrun/slapd.2.args
 
 database       @BACKEND@
 suffix         "ou=Information Technology Division,ou=People,dc=example,dc=com"
-directory      ./testrun/db.2.a
+subordinate
+directory      @TESTDIR@/db.2.a
 rootdn         "cn=Manager 2,dc=example,dc=com"
 #bdb#index             objectclass     eq
 #bdb#index             uid     pres,eq,sub
@@ -60,13 +61,14 @@ syncrepl    rid=2
                schemachecking=off
                scope=sub
                type=refreshAndPersist
-               retry="10 3 300 5"
+               retry="3 3 300 5"
 updateref      @URI1@
 #overlay               syncprov
 
 database       @BACKEND@
 suffix         "ou=Groups,dc=example,dc=com"
-directory      ./testrun/db.2.b
+subordinate
+directory      @TESTDIR@/db.2.b
 rootdn         "cn=Manager 2,dc=example,dc=com"
 #bdb#index             objectclass     eq
 #bdb#index             uid     pres,eq,sub
@@ -86,7 +88,7 @@ overlay               syncprov
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      ./testrun/db.2.c
+directory      @TESTDIR@/db.2.c
 rootdn         "cn=Manager 2,dc=example,dc=com"
 rootpw         secret
 #bdb#index             objectclass     eq
@@ -101,8 +103,5 @@ rootpw              secret
 #ldbm#dbnosync
 #ldbm#dbnolocking
 #overlay               syncprov
-overlay                glue
-glue-sub       "ou=Information Technology Division,ou=People,dc=example,dc=com"
-glue-sub       "ou=Groups,dc=example,dc=com"
 
 #monitor#database      monitor