From c9565e7530e71b381c1c31a3bf3fb8a8497cf111 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Mon, 12 Aug 2002 21:49:27 +0000 Subject: [PATCH] Rewrite master/slave ports --- tests/data/slapd-ref-slave.conf | 2 +- tests/data/slapd-repl-master.conf | 2 +- tests/data/slapd-repl-slave.conf | 4 ++-- tests/data/slapd-repl-submaster.conf | 2 +- tests/data/slapd-repl-subslave.conf | 4 ++-- tests/scripts/conf.sh | 4 +++- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/data/slapd-ref-slave.conf b/tests/data/slapd-ref-slave.conf index f9335b767b..484b2e1b22 100644 --- a/tests/data/slapd-ref-slave.conf +++ b/tests/data/slapd-ref-slave.conf @@ -15,7 +15,7 @@ argsfile ./test-repl/slapd.args # ldbm database definitions ####################################################################### -referral "ldap://localhost:9009/" +referral "ldap://localhost:@PORT@/" database @BACKEND@ cachesize 0 diff --git a/tests/data/slapd-repl-master.conf b/tests/data/slapd-repl-master.conf index 48c1c1b9b3..55e5f43118 100644 --- a/tests/data/slapd-repl-master.conf +++ b/tests/data/slapd-repl-master.conf @@ -28,7 +28,7 @@ rootpw secret replogfile ./test-db/slapd.replog -replica host=localhost:9010 +replica host=localhost:@SLAVEPORT@ binddn="cn=Replica,o=University of Michigan,c=US" bindmethod=simple credentials=secret diff --git a/tests/data/slapd-repl-slave.conf b/tests/data/slapd-repl-slave.conf index 28ab128971..18be384483 100644 --- a/tests/data/slapd-repl-slave.conf +++ b/tests/data/slapd-repl-slave.conf @@ -11,7 +11,7 @@ include ./schema/openldap.schema pidfile ./test-repl/slapd.pid argsfile ./test-repl/slapd.args -#referral "ldap://localhost:9009/" +#referral "ldap://localhost:@PORT@/" ####################################################################### # ldbm database definitions @@ -24,7 +24,7 @@ directory ./test-repl rootdn "cn=Replica,o=University of Michigan,c=US" rootpw secret updatedn "cn=Replica,o=University of Michigan,c=US" -updateref "ldap://localhost:9009" +updateref "ldap://localhost:@PORT@" #ldbm#index objectClass eq #ldbm#index cn,sn,uid pres,eq,sub #bdb#index objectClass eq diff --git a/tests/data/slapd-repl-submaster.conf b/tests/data/slapd-repl-submaster.conf index 699dedbcc9..2521cf851d 100644 --- a/tests/data/slapd-repl-submaster.conf +++ b/tests/data/slapd-repl-submaster.conf @@ -28,7 +28,7 @@ rootpw secret replogfile ./test-db/slapd.replog -replica host=localhost:9010 +replica host=localhost:@SLAVEPORT@ suffix="ou=Groups,o=University of Michigan,c=US" binddn="cn=Replica,ou=Groups,o=University of Michigan,c=US" bindmethod=simple diff --git a/tests/data/slapd-repl-subslave.conf b/tests/data/slapd-repl-subslave.conf index 79b2f80dba..6552af67e5 100644 --- a/tests/data/slapd-repl-subslave.conf +++ b/tests/data/slapd-repl-subslave.conf @@ -11,7 +11,7 @@ include ./schema/openldap.schema pidfile ./test-repl/slapd.pid argsfile ./test-repl/slapd.args -#referral "ldap://localhost:9009/" +#referral "ldap://localhost:@PORT@/" ####################################################################### # ldbm database definitions @@ -24,7 +24,7 @@ directory ./test-repl rootdn "cn=Replica,ou=Groups,o=University of Michigan,c=US" rootpw secret updatedn "cn=Replica,ou=Groups,o=University of Michigan,c=US" -updateref "ldap://localhost:9009" +updateref "ldap://localhost:@PORT@" #ldbm#index objectClass eq #ldbm#index cn,sn,uid pres,eq,sub #bdb#index objectClass eq diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh index 703b199f4b..b919732e36 100755 --- a/tests/scripts/conf.sh +++ b/tests/scripts/conf.sh @@ -1,8 +1,10 @@ #! /bin/sh # $OpenLDAP$ +# . $SRCDIR/scripts/defines.sh if [ x"$MONITORDB" = x"yes" ] ; then MON=monitor else MON=nomonitor fi -sed -e "s/@BACKEND@/$BACKEND/" -e "s/^#$BACKEND#//" -e "s/^#$MON#//" +sed -e "s/@BACKEND@/$BACKEND/" -e "s/^#$BACKEND#//" -e "s/^#$MON#//" \ + -e "s/@PORT@/$PORT/" -e "s/@SLAVEPORT@/$SLAVEPORT/" -- 2.39.5