commit b25e0a50d33507557a7a83164a19b080fdd03255
author Bertrand Gouny <bertrand.gouny@osixia.net> Thu Dec 13 18:39:36 2018 +0100
committer Bertrand Gouny <bertrand.gouny@osixia.net> Thu Dec 13 18:39:36 2018 +0100
tree 0b0e7f86e3369db9dbfb74d651ca8421b61c4faf
parent 394a1a0efc10cce376178199305a6ed4e4587f4c
parent 9d7b166a52d6bcb683fe153678fc02fd71941702

Merge branch 'fbartels-ldap_domain' into release-1.2.3

README.md

diff --git a/README.md b/README.md
index 440a658..de665bc 100644
--- a/README.md
+++ b/README.md
@@ -133,6 +133,7 @@
 
 - `{{ LDAP_BASE_DN }}`
 - `{{ LDAP_BACKEND }}`
+- `{{ LDAP_DOMAIN }}`
 - `{{ LDAP_READONLY_USER_USERNAME }}`
 - `{{ LDAP_READONLY_USER_PASSWORD_ENCRYPTED }}`
 

image/service/slapd/startup.sh

diff --git a/image/service/slapd/startup.sh b/image/service/slapd/startup.sh
index 25656ed..07f9ba3 100755
--- a/image/service/slapd/startup.sh
+++ b/image/service/slapd/startup.sh
@@ -68,6 +68,7 @@
     log-helper debug "Processing file ${LDIF_FILE}"
     sed -i "s|{{ LDAP_BASE_DN }}|${LDAP_BASE_DN}|g" $LDIF_FILE
     sed -i "s|{{ LDAP_BACKEND }}|${LDAP_BACKEND}|g" $LDIF_FILE
+    sed -i "s|{{ LDAP_DOMAIN }}|${LDAP_DOMAIN}|g" $LDIF_FILE
     if [ "${LDAP_READONLY_USER,,}" == "true" ]; then
       sed -i "s|{{ LDAP_READONLY_USER_USERNAME }}|${LDAP_READONLY_USER_USERNAME}|g" $LDIF_FILE
       sed -i "s|{{ LDAP_READONLY_USER_PASSWORD_ENCRYPTED }}|${LDAP_READONLY_USER_PASSWORD_ENCRYPTED}|g" $LDIF_FILE