Use proxycache overlay

diff --git a/tests/data/slapd-proxycache.conf b/tests/data/slapd-proxycache.conf
index b2add6011e82545c3f8f73288f7c579715c5aa43..37163278d7e68fea622969d46c8d1c3717027815 100644 (file)
--- a/tests/data/slapd-proxycache.conf
+++ b/tests/data/slapd-proxycache.conf
@@ -23,44 +23,30 @@ include ./schema/nis.schema
 pidfile     ./testrun/slapd.2.pid
 argsfile    ./testrun/slapd.2.args
 
-access to * by write
-
 #mod#modulepath        ../servers/slapd/back-@BACKEND@/
 #mod#moduleload        back_@BACKEND@.la
 #ldapmod#moduleload    ../servers/slapd/back-ldap/back_ldap.la
-#metamod#moduleload    ../servers/slapd/back-meta/back_meta.la
+#pcachemod#moduleload ../servers/slapd/overlays/pcache.la
 
 #######################################################################
 # database definitions
 #######################################################################
 
-database @BACKEND@
-
-suffix "o=University of Michigan,c=US,cn=cache" 
+database       ldap
+suffix          "o=University of Michigan,c=US"
+rootdn          "o=University of Michigan,c=US"
+uri            ldap://127.0.0.1:9011
+
+overlay proxycache
+proxycache     @BACKEND@ 100 2 @ENTRY_LIMIT@ @CACHETTL@
+proxyattrset 0         sn cn title uid
+proxyattrset 1         mail postaladdress telephonenumber cn uid
+proxytemplate          (|(cn=)(sn=)) 0 @CACHETTL@
+proxytemplate          (sn=) 0 @CACHETTL@
+proxytemplate          (uid=) 1 @CACHETTL@
+proxytemplate          (mail=) 0 @CACHETTL@
+       
 cachesize 20
 directory ./testrun/db.2.a
 index          objectClass     eq
 index          cn,sn,uid,mail  pres,eq,sub
-
-database       meta
-rewriteEngine on
-rewriteContext cacheResult
-rewriteRule "(.*)o=University of Michigan,c=US" "%1o=University of Michigan,c=US,cn=cache" ":"
-rewriteContext cacheBase
-rewriteRule "(.*)o=University of Michigan,c=US" "%1o=university of michigan,c=us,cn=cache" ":"
-rewriteContext cacheReturn 
-rewriteRule "(.*)o=University of Michigan,c=US,cn=cache" "%1o=University of Michigan,c=US" ":"
- 
-
-suffix          "o=University of Michigan,c=US"
-uri            ldap://127.0.0.1:9011/o=University%20of%20Michigan,c=US
-cacheparams    10000 15000 2 @ENTRY_LIMIT@ @CACHETTL@
-
-attrset 0      sn cn title uid
-attrset 1      mail postaladdress telephonenumber cn uid
-addtemplate    (|(cn=)(sn=)) 0 @CACHETTL@
-addtemplate    (sn=) 0 @CACHETTL@
-addtemplate    (uid=) 1 @CACHETTL@
-addtemplate    (mail=) 0 @CACHETTL@
-       
-