Commit a3f18688 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#9351 - Always build back-monitor as a static backend

parent c59ccf53
......@@ -41,7 +41,7 @@ ITS=8427
ITSDIR=$DATADIR/regressions/its$ITS
echo "Running slapadd to build slapd database..."
. $CONFFILTER $BACKEND $MONITORDB < $TLSCONF > $CONF1
. $CONFFILTER $BACKEND < $TLSCONF > $CONF1
$SLAPADD -f $CONF1 -l $LDIFORDERED
RC=$?
if test $RC != 0 ; then
......@@ -85,7 +85,7 @@ echo "database config" >> $CONF2
echo "include $TESTDIR/configpw.conf" >> $CONF2
echo "Starting proxy slapd on TCP/IP port $PORT3..."
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf > $CONF2
. $CONFFILTER $BACKEND < $ITSDIR/slapd.conf > $CONF2
$SLAPD -f $CONF2 -h $URI3 -d $LVL > $LOG2 2>&1 &
PROXYPID=$!
if test $WAIT != 0 ; then
......
......@@ -25,10 +25,7 @@ argsfile @TESTDIR@/slapd.2.args
#ldapmod#modulepath ../servers/slapd/back-ldap/
#ldapmod#moduleload back_ldap.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#monitor#database monitor
database monitor
database config
include @TESTDIR@/configpw.conf
......@@ -59,7 +59,7 @@ while [ $n -le $MPR ]; do
CFDIR=${XDIR}$n/slapd.d
mkdir -p ${XDIR}$n $DBDIR.1 $DBDIR.2 $CFDIR
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd-provider${n}.ldif > $CONFLDIF
. $CONFFILTER $BACKEND < $ITSDIR/slapd-provider${n}.ldif > $CONFLDIF
$SLAPADD -F $CFDIR -n 0 -l $CONFLDIF
n=`expr $n + 1`
done
......
......@@ -24,15 +24,9 @@ include: file://@TESTWD@/@SCHEMADIR@/dyngroup.ldif
#mod#olcModulePath: @TESTWD@/../servers/slapd/back-@BACKEND@/
#mod#olcModuleLoad: {0}back_@BACKEND@.la
#monitormod#dn: cn=module{1},cn=config
#monitormod#objectClass: olcModuleList
#monitormod#cn: module{1}
#monitormod#olcModulePath: @TESTWD@/../servers/slapd/back-monitor/
#monitormod#olcModuleLoad: {0}back_monitor.la
#memberofmod#dn: cn=module{2},cn=config
#memberofmod#dn: cn=module{1},cn=config
#memberofmod#objectClass: olcModuleList
#memberofmod#cn: module{2}
#memberofmod#cn: module{1}
#memberofmod#olcModulePath: @TESTWD@/../servers/slapd/overlays/
#memberofmod#olcModuleLoad: {0}memberof.la
#dynlistmod#olcModuleLoad: {1}dynlist.la
......
......@@ -24,15 +24,9 @@ include: file://@TESTWD@/@SCHEMADIR@/dyngroup.ldif
#mod#olcModulePath: @TESTWD@/../servers/slapd/back-@BACKEND@/
#mod#olcModuleLoad: {0}back_@BACKEND@.la
#monitormod#dn: cn=module{1},cn=config
#monitormod#objectClass: olcModuleList
#monitormod#cn: module{1}
#monitormod#olcModulePath: @TESTWD@/../servers/slapd/back-monitor/
#monitormod#olcModuleLoad: {0}back_monitor.la
#memberofmod#dn: cn=module{2},cn=config
#memberofmod#dn: cn=module{1},cn=config
#memberofmod#objectClass: olcModuleList
#memberofmod#cn: module{2}
#memberofmod#cn: module{1}
#memberofmod#olcModulePath: @TESTWD@/../servers/slapd/overlays/
#memberofmod#olcModuleLoad: {0}memberof.la
#dynlistmod#olcModuleLoad: {1}dynlist.la
......
......@@ -24,15 +24,9 @@ include: file://@TESTWD@/@SCHEMADIR@/dyngroup.ldif
#mod#olcModulePath: @TESTWD@/../servers/slapd/back-@BACKEND@/
#mod#olcModuleLoad: {0}back_@BACKEND@.la
#monitormod#dn: cn=module{1},cn=config
#monitormod#objectClass: olcModuleList
#monitormod#cn: module{1}
#monitormod#olcModulePath: @TESTWD@/../servers/slapd/back-monitor/
#monitormod#olcModuleLoad: {0}back_monitor.la
#memberofmod#dn: cn=module{2},cn=config
#memberofmod#dn: cn=module{1},cn=config
#memberofmod#objectClass: olcModuleList
#memberofmod#cn: module{2}
#memberofmod#cn: module{1}
#memberofmod#olcModulePath: @TESTWD@/../servers/slapd/overlays/
#memberofmod#olcModuleLoad: {0}memberof.la
#dynlistmod#olcModuleLoad: {1}dynlist.la
......
......@@ -24,15 +24,9 @@ include: file://@TESTWD@/@SCHEMADIR@/dyngroup.ldif
#mod#olcModulePath: @TESTWD@/../servers/slapd/back-@BACKEND@/
#mod#olcModuleLoad: {0}back_@BACKEND@.la
#monitormod#dn: cn=module{1},cn=config
#monitormod#objectClass: olcModuleList
#monitormod#cn: module{1}
#monitormod#olcModulePath: @TESTWD@/../servers/slapd/back-monitor/
#monitormod#olcModuleLoad: {0}back_monitor.la
#memberofmod#dn: cn=module{2},cn=config
#memberofmod#dn: cn=module{1},cn=config
#memberofmod#objectClass: olcModuleList
#memberofmod#cn: module{2}
#memberofmod#cn: module{1}
#memberofmod#olcModulePath: @TESTWD@/../servers/slapd/overlays/
#memberofmod#olcModuleLoad: {0}memberof.la
#dynlistmod#olcModuleLoad: {1}dynlist.la
......
......@@ -45,7 +45,7 @@ ITS=8521
ITSDIR=$DATADIR/regressions/its$ITS
echo "Starting provider slapd on TCP/IP port $PORT1..."
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd-provider.ldif > $CONFLDIF
. $CONFFILTER $BACKEND < $ITSDIR/slapd-provider.ldif > $CONFLDIF
$SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
$SLAPD -F $CFPRO -h $URI1 -d $LVL > $LOG1 2>&1 &
PID=$!
......@@ -76,7 +76,7 @@ if test $RC != 0 ; then
fi
echo "Starting consumer slapd on TCP/IP port $PORT2..."
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd-consumer.ldif > $CONFLDIF
. $CONFFILTER $BACKEND < $ITSDIR/slapd-consumer.ldif > $CONFLDIF
$SLAPADD -F $CFCON -n 0 -l $CONFLDIF
$SLAPD -F $CFCON -h $URI2 -d $LVL > $LOG2 2>&1 &
SLAVEPID=$!
......
......@@ -21,12 +21,6 @@ include: file://@TESTWD@/@SCHEMADIR@/misc.ldif
#mod#olcModulePath: @TESTWD@/../servers/slapd/back-@BACKEND@/
#mod#olcModuleLoad: {0}back_@BACKEND@.la
#monitormod#dn: cn=module{1},cn=config
#monitormod#objectClass: olcModuleList
#monitormod#cn: module{1}
#monitormod#olcModulePath: @TESTWD@/../servers/slapd/back-monitor/
#monitormod#olcModuleLoad: {0}back_monitor.la
dn: olcDatabase={-1}frontend,cn=config
objectClass: olcDatabaseConfig
objectClass: olcFrontendConfig
......
......@@ -21,12 +21,6 @@ include: file://@TESTWD@/@SCHEMADIR@/misc.ldif
#mod#olcModulePath: @TESTWD@/../servers/slapd/back-@BACKEND@/
#mod#olcModuleLoad: {0}back_@BACKEND@.la
#monitormod#dn: cn=module{1},cn=config
#monitormod#objectClass: olcModuleList
#monitormod#cn: module{1}
#monitormod#olcModulePath: @TESTWD@/../servers/slapd/back-monitor/
#monitormod#olcModuleLoad: {0}back_monitor.la
dn: olcDatabase={-1}frontend,cn=config
objectClass: olcDatabaseConfig
objectClass: olcFrontendConfig
......
......@@ -38,7 +38,7 @@ ITS=8616
ITSDIR=$DATADIR/regressions/its$ITS
echo "Starting provider slapd on TCP/IP port $PORT1..."
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd-provider.ldif > $CONFLDIF
. $CONFFILTER $BACKEND < $ITSDIR/slapd-provider.ldif > $CONFLDIF
$SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
$SLAPD -F $CFPRO -h $URI1 -d $LVL > $LOG1 2>&1 &
PID=$!
......
......@@ -21,12 +21,6 @@ include: file://@TESTWD@/@SCHEMADIR@/misc.ldif
#mod#olcModulePath: @TESTWD@/../servers/slapd/back-@BACKEND@/
#mod#olcModuleLoad: {0}back_@BACKEND@.la
#monitormod#dn: cn=module{1},cn=config
#monitormod#objectClass: olcModuleList
#monitormod#cn: module{1}
#monitormod#olcModulePath: @TESTWD@/../servers/slapd/back-monitor/
#monitormod#olcModuleLoad: {0}back_monitor.la
dn: olcDatabase={-1}frontend,cn=config
objectClass: olcDatabaseConfig
objectClass: olcFrontendConfig
......
......@@ -38,7 +38,7 @@ ITS=8663
ITSDIR=$DATADIR/regressions/its$ITS
echo "Starting provider slapd on TCP/IP port $PORT1..."
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd-provider.ldif > $CONFLDIF
. $CONFFILTER $BACKEND < $ITSDIR/slapd-provider.ldif > $CONFLDIF
$SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
$SLAPD -F $CFPRO -h $URI1 -d $LVL > $LOG1 2>&1 &
PID=$!
......
......@@ -21,12 +21,6 @@ include: file://@TESTWD@/@SCHEMADIR@/misc.ldif
#mod#olcModulePath: @TESTWD@/../servers/slapd/back-@BACKEND@/
#mod#olcModuleLoad: {0}back_@BACKEND@.la
#monitormod#dn: cn=module{1},cn=config
#monitormod#objectClass: olcModuleList
#monitormod#cn: module{1}
#monitormod#olcModulePath: @TESTWD@/../servers/slapd/back-monitor/
#monitormod#olcModuleLoad: {0}back_monitor.la
dn: olcDatabase={-1}frontend,cn=config
objectClass: olcDatabaseConfig
objectClass: olcFrontendConfig
......
......@@ -36,7 +36,7 @@ ITS=8667
ITSDIR=$DATADIR/regressions/its$ITS
echo "Starting slapd on TCP/IP port $PORT1..."
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.ldif > $CONFLDIF
. $CONFFILTER $BACKEND < $ITSDIR/slapd.ldif > $CONFLDIF
$SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
echo "Populating root database..."
......
......@@ -20,12 +20,6 @@ include: file://@TESTWD@/@SCHEMADIR@/inetorgperson.ldif
#mod#olcModulePath: @TESTWD@/../servers/slapd/back-@BACKEND@/
#mod#olcModuleLoad: {0}back_@BACKEND@.la
#monitormod#dn: cn=module{1},cn=config
#monitormod#objectClass: olcModuleList
#monitormod#cn: module{1}
#monitormod#olcModulePath: @TESTWD@/../servers/slapd/back-monitor/
#monitormod#olcModuleLoad: {0}back_monitor.la
dn: olcDatabase={-1}frontend,cn=config
objectClass: olcDatabaseConfig
objectClass: olcFrontendConfig
......
......@@ -68,7 +68,7 @@ done
KILLPIDS=
echo "Starting slapd on TCP/IP port $PORT1..."
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf > $CONF1
. $CONFFILTER $BACKEND < $ITSDIR/slapd.conf > $CONF1
$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
PID=$!
if test $WAIT != 0 ; then
......@@ -170,7 +170,7 @@ while [ $n -le $MPR ]; do
MYLOG=`eval echo '$LOG'$n`
MYCONF=`eval echo '$CONF'$n`
echo "Starting provider slapd on TCP/IP URI $MYURI"
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf.mpr > $TESTDIR/slapd.conf
. $CONFFILTER $BACKEND < $ITSDIR/slapd.conf.mpr > $TESTDIR/slapd.conf
sed -e "s/MPR/$n/g" -e "s/wronglog/log/" -e "s/@MAPSIZE@/$MAPSIZE/" $TESTDIR/slapd.conf > $MYCONF
j=1
while [ $j -le $MPR ]; do
......@@ -388,7 +388,7 @@ while [ $n -le $MPR ]; do
MYLOG=`eval echo '$LOG'$n`
MYCONF=`eval echo '$CONF'$n`
echo "Starting provider slapd on TCP/IP URI $MYURI"
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf.mpr > $TESTDIR/slapd.conf
. $CONFFILTER $BACKEND < $ITSDIR/slapd.conf.mpr > $TESTDIR/slapd.conf
sed -e "s/MPR/$n/g" -e "s/@MAPSIZE@/$MAPSIZE/" $TESTDIR/slapd.conf > $MYCONF
j=1
while [ $j -le $MPR ]; do
......
......@@ -26,8 +26,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/:../servers/slapd/overlays
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
database config
rootpw config
......@@ -40,4 +38,4 @@ rootpw secret
#indexdb#index objectClass eq
#indexdb#index cn,sn,uid pres,eq,sub
#monitor#database monitor
database monitor
......@@ -27,8 +27,6 @@ argsfile @TESTDIR@/slapd.MPR.args
serverid MPR
#mod#modulepath ../servers/slapd/back-@BACKEND@/:../servers/slapd/overlays
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#syncprovmod#modulepath ../servers/slapd/overlays/
#syncprovmod#moduleload syncprov.la
#accesslogmod#modulepath ../servers/slapd/overlays/
......@@ -141,4 +139,4 @@ overlay syncprov
syncprov-reloadhint true
syncprov-nopresent true
#monitor#database monitor
database monitor
......@@ -56,7 +56,7 @@ while [ $n -le $MPR ]; do
CFDIR=${XDIR}$n/slapd.d
mkdir -p ${XDIR}$n $DBDIR.1 $DBDIR.2 $CFDIR
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd-provider${n}.ldif > $CONFLDIF
. $CONFFILTER $BACKEND < $ITSDIR/slapd-provider${n}.ldif > $CONFLDIF
$SLAPADD -F $CFDIR -n 0 -l $CONFLDIF
$SLAPADD -F $CFDIR -q -b $BASEDN -l $ITSDIR/db.ldif
n=`expr $n + 1`
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment