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
......@@ -23,15 +23,9 @@ include: file://@TESTWD@/@SCHEMADIR@/nis.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
#syncprovmod#dn: cn=module{2},cn=config
#syncprovmod#dn: cn=module{1},cn=config
#syncprovmod#objectClass: olcModuleList
#syncprovmod#cn: module{2}
#syncprovmod#cn: module{1}
#syncprovmod#olcModulePath: @TESTWD@/../servers/slapd/overlays/
#syncprovmod#olcModuleLoad: {0}syncprov.la
#accesslogmod#olcModuleLoad: {1}accesslog.la
......
......@@ -23,15 +23,9 @@ include: file://@TESTWD@/@SCHEMADIR@/nis.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
#syncprovmod#dn: cn=module{2},cn=config
#syncprovmod#dn: cn=module{1},cn=config
#syncprovmod#objectClass: olcModuleList
#syncprovmod#cn: module{2}
#syncprovmod#cn: module{1}
#syncprovmod#olcModulePath: @TESTWD@/../servers/slapd/overlays/
#syncprovmod#olcModuleLoad: {0}syncprov.la
#accesslogmod#olcModuleLoad: {1}accesslog.la
......
......@@ -23,15 +23,9 @@ include: file://@TESTWD@/@SCHEMADIR@/nis.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
#syncprovmod#dn: cn=module{2},cn=config
#syncprovmod#dn: cn=module{1},cn=config
#syncprovmod#objectClass: olcModuleList
#syncprovmod#cn: module{2}
#syncprovmod#cn: module{1}
#syncprovmod#olcModulePath: @TESTWD@/../servers/slapd/overlays/
#syncprovmod#olcModuleLoad: {0}syncprov.la
#accesslogmod#olcModuleLoad: {1}accesslog.la
......
......@@ -23,15 +23,9 @@ include: file://@TESTWD@/@SCHEMADIR@/nis.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
#syncprovmod#dn: cn=module{2},cn=config
#syncprovmod#dn: cn=module{1},cn=config
#syncprovmod#objectClass: olcModuleList
#syncprovmod#cn: module{2}
#syncprovmod#cn: module{1}
#syncprovmod#olcModulePath: @TESTWD@/../servers/slapd/overlays/
#syncprovmod#olcModuleLoad: {0}syncprov.la
#accesslogmod#olcModuleLoad: {1}accesslog.la
......
......@@ -48,7 +48,7 @@ while [ $n -le $MMR ]; do
CFDIR=${XDIR}$n/slapd.d
mkdir -p ${XDIR}$n $DBDIR.1 $DBDIR.2 $CFDIR
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/config.ldif > $TESTDIR/config${n}.ldif
. $CONFFILTER $BACKEND < $ITSDIR/config.ldif > $TESTDIR/config${n}.ldif
if [ $n = 1 ]; then
MYURI=`eval echo '$URI2'`
else
......
......@@ -41,7 +41,7 @@ echo ""
#
echo "Starting provider slapd on TCP/IP port $PORT1..."
. $CONFFILTER $BACKEND $MONITORDB < $SRPROVIDERCONF > $CONF1
. $CONFFILTER $BACKEND < $SRPROVIDERCONF > $CONF1
$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
PID=$!
if test $WAIT != 0 ; then
......
......@@ -23,8 +23,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
......@@ -49,4 +47,4 @@ rootpw secret
#ndb#dbname db_2
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor
......@@ -26,8 +26,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#acimod#modulepath ../servers/slapd/
#acimod#moduleload aci.la
......@@ -54,5 +52,5 @@ rootpw secret
access to dn.subtree="dc=example,dc=com"
by dynacl/aci write
#monitor#database monitor
#monitor#rootdn "cn=Monitor"
database monitor
rootdn "cn=Monitor"
......@@ -33,8 +33,6 @@ access to *
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
......@@ -143,4 +141,4 @@ access to dn.subtree="ou=Add & Delete,dc=example,dc=com"
# fall into global ACLs
#monitor#database monitor
database monitor
......@@ -25,8 +25,6 @@ argsfile @TESTDIR@/slapd.m.args
#ldapmod#moduleload back_ldap.la
#asyncmetamod#modulepath ../servers/slapd/back-asyncmeta/
#asyncmetamod#moduleload back_asyncmeta.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
# seems to improve behavior under very heavy load
# (i.e. it alleviates load on target systems)
......@@ -84,4 +82,4 @@ rootdn "cn=Manager,o=Local"
rootpw secret
uri "@URI6@o=Local"
#monitor#database monitor
database monitor
......@@ -27,8 +27,6 @@ disallow bind_anon
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
......@@ -44,4 +42,4 @@ rootpw secret
#ndb#dbname db_1
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor
......@@ -24,8 +24,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
......@@ -41,4 +39,4 @@ rootpw secret
#ndb#dbname db_1
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor
......@@ -25,8 +25,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#moduleload back_@BACKEND@.la
#ldapmod#modulepath ../servers/slapd/back-ldap/
#ldapmod#moduleload back_ldap.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#
# uses the chain overlay as global;
......@@ -60,4 +58,4 @@ rootpw secret
#ndb#dbname db_1
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor
......@@ -25,8 +25,6 @@ argsfile @TESTDIR@/slapd.2.args
#mod#moduleload back_@BACKEND@.la
#ldapmod#modulepath ../servers/slapd/back-ldap/
#ldapmod#moduleload back_ldap.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
......@@ -59,4 +57,4 @@ chain-idassert-bind bindmethod=simple
mode=self
flags=non-prescriptive
#monitor#database monitor
database monitor
......@@ -29,8 +29,6 @@ moduleload @DATADIR@/comp_libs/compmatch.la
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
......@@ -45,4 +43,4 @@ rootpw secret
#ndb#dbname db_1
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor
......@@ -5,10 +5,8 @@ include @SCHEMADIR@/openldap.schema
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#monitor#database monitor
database monitor
database config
include @TESTDIR@/configpw.conf
......@@ -2,8 +2,6 @@ include @SCHEMADIR@/core.schema
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
database @BACKEND@
suffix "o=undo"
......@@ -15,7 +13,7 @@ rootpw secret
#ndb#dbname db_1
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor
database config
include @TESTDIR@/configpw.conf
......@@ -26,8 +26,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#ddsmod#modulepath ../servers/slapd/overlays/
#ddsmod#moduleload dds.la
......@@ -84,4 +82,4 @@ access to dn.onelevel="ou=Groups,dc=example,dc=com"
access to *
by * read
#monitor#database monitor
database monitor
......@@ -24,8 +24,6 @@ argsfile @TESTDIR@/slapd.2.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#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
#ldapmod#modulepath ../servers/slapd/back-ldap/
......@@ -73,4 +71,4 @@ updateref @URI1@
overlay syncprov
#monitor#database monitor
database monitor
......@@ -24,8 +24,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#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/
......@@ -72,4 +70,4 @@ logdb cn=log
logops writes
logsuccess true
#monitor#database monitor
database monitor
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