fix previous commit (cn=monitor acls + rootdn/pw)

Author: David Coutadeur

config-template.ldif

@@ -2,7 +2,7 @@ dn: cn=config
 objectClass: olcGlobal
 cn: config
 olcConfigFile: /usr/local/openldap/etc/openldap/slapd.conf
-olcConfigDir: /tmp/slapd.d-tmp
+olcConfigDir: /usr/local/openldap/etc/openldap/slapd.d
 olcArgsFile: /usr/local/openldap/var/run/slapd.args
 olcAttributeOptions: lang-
 olcAuthzPolicy: none
@@ -324,7 +324,8 @@ olcLastMod: TRUE
 olcLastBind: TRUE
 olcMaxDerefDepth: 15
 olcReadOnly: FALSE
-olcRootDN: cn=monitor
+olcRootDN: CONFIG_MONITORROOTDN
+olcRootPW: CONFIG_MONITORROOTPW
 olcSyncUseSubentry: FALSE
 olcMonitoring: FALSE
 

slapd-cli

@@ -1637,6 +1637,9 @@ build_config_template() {
 	if [ ! -z ${CONFIG_CONFIGROOTDN+x} ] && [ "${CONFIG_CONFIGROOTDN}" != "" ]; then
 		sed -i -e "s/^olcRootDN: ${CONFIG_CONFIGROOTDN}$/olcRootDN: CONFIG_CONFIGROOTDN\nolcRootPW: CONFIG_CONFIGROOTPW/" "$2"
 	fi
+	if [ ! -z ${CONFIG_MONITORROOTDN+x} ] && [ "${CONFIG_MONITORROOTDN}" != "" ]; then
+		sed -i -e "s/^olcRootDN: ${CONFIG_MONITORROOTDN}$/olcRootDN: CONFIG_MONITORROOTDN\nolcRootPW: CONFIG_MONITORROOTPW/" "$2"
+	fi
 
 	# replace olcDbDirectory by the given placeholder
 	if [ ! -z ${CONFIG_DATADIR+x} ] && [ "${CONFIG_DATADIR}" != "" ]; then