First rounded of changes in prep for 2.2.beta3

[openldap] / tests / data / slapd-master.conf

diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf
index f11a4013fedace557ea3961283cad9e551445c0f..67cfad2c018b161a00eb51ea93924f2b10ff87bf 100644 (file)
--- a/tests/data/slapd-master.conf
+++ b/tests/data/slapd-master.conf
@@ -8,8 +8,11 @@ include ./schema/cosine.schema
 include ./schema/inetorgperson.schema
 include ./schema/openldap.schema
 include ./schema/nis.schema
-pidfile     ./test-db/slapd.pid
-argsfile    ./test-db/slapd.args
+
+include ./testdata/ditcontentrules.conf
+
+pidfile     ./testrun/slapd.1.pid
+argsfile    ./testrun/slapd.1.args
 
 modulepath      ../servers/slapd/back-@BACKEND@/
 @MODULELOAD@
@@ -20,7 +23,7 @@ modulepath      ../servers/slapd/back-@BACKEND@/
 
 database       @BACKEND@
 suffix         "o=University of Michigan,c=US"
-directory      ./test-db
+directory      ./testrun/db.1.a
 rootdn         "cn=Manager,o=University of Michigan,c=US"
 rootpw         secret
 #ldbm#index            objectClass eq