From: Howard Chu Date: Mon, 29 May 2006 21:26:00 +0000 (+0000) Subject: Fix suffix in prev commit X-Git-Tag: OPENLDAP_REL_ENG_2_4_3ALPHA~9^2~200 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d8442daba6042d47c75acf390e1245cba16d1f92;p=openldap Fix suffix in prev commit --- diff --git a/tests/data/slapd-syncrepl-multiproxy.conf b/tests/data/slapd-syncrepl-multiproxy.conf new file mode 100644 index 0000000000..fe58ff1a47 --- /dev/null +++ b/tests/data/slapd-syncrepl-multiproxy.conf @@ -0,0 +1,106 @@ +# slave slapd config -- for testing of SYNC replication with intermediate proxy +# $OpenLDAP$ +## This work is part of OpenLDAP Software . +## +## Copyright 1998-2006 The OpenLDAP Foundation. +## All rights reserved. +## +## Redistribution and use in source and binary forms, with or without +## modification, are permitted only as authorized by the OpenLDAP +## Public License. +## +## A copy of this license is available in the file LICENSE in the +## top-level directory of the distribution or, alternatively, at +## . + +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 +#syncprovmod#modulepath ../servers/slapd/overlays/ +#syncprovmod#moduleload syncprov.la +#ldapmod#modulepath ../servers/slapd/back-ldap/ +#ldapmod#moduleload back_ldap.la + +####################################################################### +# master database definitions +####################################################################### + +database @BACKEND@ +suffix "dc=example,dc=com" +directory @TESTDIR@/db.1.a +rootdn "cn=Manager,dc=example,dc=com" +rootpw secret +#bdb#index objectClass eq +#bdb#index cn,sn,uid pres,eq,sub +#bdb#index entryUUID,entryCSN eq +#hdb#index objectClass eq +#hdb#index cn,sn,uid pres,eq,sub +#hdb#index entryUUID,entryCSN eq +#ldbm#index objectClass eq +#ldbm#index cn,sn,uid pres,eq,sub + +overlay syncprov +syncprov-sessionlog 100 + +####################################################################### +# consumer proxy database definitions +####################################################################### + +database ldap +hidden on +suffix "dc=example,dc=com" +rootdn "cn=Whoever" +uri @URI2@ + +acl-bind bindmethod=simple + binddn="cn=Monitor" + credentials=monitor + +# Don't change syncrepl spec yet + +syncrepl rid=1 + provider=@URI1@ + binddn="cn=Manager,dc=example,dc=com" + bindmethod=simple + credentials=secret + searchbase="dc=example,dc=com" + filter="(objectClass=*)" + schemachecking=off + scope=sub + type=refreshAndPersist + retry="5 5 300 5" + +database ldap +hidden on +suffix "dc=example,dc=com" +rootdn "cn=Whoever" +uri @URI3@ + +acl-bind bindmethod=simple + binddn="cn=Monitor" + credentials=monitor + +# Don't change syncrepl spec yet + +syncrepl rid=2 + provider=@URI1@ + binddn="cn=Manager,dc=example,dc=com" + bindmethod=simple + credentials=secret + searchbase="dc=example,dc=com" + filter="(objectClass=*)" + schemachecking=off + scope=sub + type=refreshOnly + interval=00:00:00:10 + retry="5 5 300 5" + +#monitor#database monitor diff --git a/tests/data/slapd-syncrepl-multiproxy.ldif b/tests/data/slapd-syncrepl-multiproxy.ldif deleted file mode 100644 index fe58ff1a47..0000000000 --- a/tests/data/slapd-syncrepl-multiproxy.ldif +++ /dev/null @@ -1,106 +0,0 @@ -# slave slapd config -- for testing of SYNC replication with intermediate proxy -# $OpenLDAP$ -## This work is part of OpenLDAP Software . -## -## Copyright 1998-2006 The OpenLDAP Foundation. -## All rights reserved. -## -## Redistribution and use in source and binary forms, with or without -## modification, are permitted only as authorized by the OpenLDAP -## Public License. -## -## A copy of this license is available in the file LICENSE in the -## top-level directory of the distribution or, alternatively, at -## . - -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 -#syncprovmod#modulepath ../servers/slapd/overlays/ -#syncprovmod#moduleload syncprov.la -#ldapmod#modulepath ../servers/slapd/back-ldap/ -#ldapmod#moduleload back_ldap.la - -####################################################################### -# master database definitions -####################################################################### - -database @BACKEND@ -suffix "dc=example,dc=com" -directory @TESTDIR@/db.1.a -rootdn "cn=Manager,dc=example,dc=com" -rootpw secret -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#bdb#index entryUUID,entryCSN eq -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub -#hdb#index entryUUID,entryCSN eq -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub - -overlay syncprov -syncprov-sessionlog 100 - -####################################################################### -# consumer proxy database definitions -####################################################################### - -database ldap -hidden on -suffix "dc=example,dc=com" -rootdn "cn=Whoever" -uri @URI2@ - -acl-bind bindmethod=simple - binddn="cn=Monitor" - credentials=monitor - -# Don't change syncrepl spec yet - -syncrepl rid=1 - provider=@URI1@ - binddn="cn=Manager,dc=example,dc=com" - bindmethod=simple - credentials=secret - searchbase="dc=example,dc=com" - filter="(objectClass=*)" - schemachecking=off - scope=sub - type=refreshAndPersist - retry="5 5 300 5" - -database ldap -hidden on -suffix "dc=example,dc=com" -rootdn "cn=Whoever" -uri @URI3@ - -acl-bind bindmethod=simple - binddn="cn=Monitor" - credentials=monitor - -# Don't change syncrepl spec yet - -syncrepl rid=2 - provider=@URI1@ - binddn="cn=Manager,dc=example,dc=com" - bindmethod=simple - credentials=secret - searchbase="dc=example,dc=com" - filter="(objectClass=*)" - schemachecking=off - scope=sub - type=refreshOnly - interval=00:00:00:10 - retry="5 5 300 5" - -#monitor#database monitor