Still better root DN password management

If the environment variable OLC_ROOT_DN_PASSWORD is set but OLC_ROOT_DN (usually a hash) is not and is set to the Dockerfile default of 'password', then take OLC_ROOT_DN from OLC_ROOT_DN_PASSWORD.
docker · Mar 18, 2020 · e11d6fe · e11d6fe
1 parent 83e8bfd
commit e11d6fe
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/comanage-registry-slapd-base/comanage_ldap_utils.sh b/comanage-registry-slapd-base/comanage_ldap_utils.sh
@@ -105,7 +105,7 @@ function comanage_ldap_utils::bootstrap() {
     local suffix="${OLC_SUFFIX:-dc=my,dc=org}"
     local root_dn="${OLC_ROOT_DN:-cn=admin,dc=my,dc=org}"
 
-    if [[ -n "${OLC_ROOT_DN_PASSWORD}" && -z "${OLC_ROOT_PW}" ]]; then
+    if [[ -n "${OLC_ROOT_DN_PASSWORD}" && "${OLC_ROOT_PW}" = "password" ]]; then
         local root_pw="${OLC_ROOT_DN_PASSWORD}"
     else
         local root_pw="${OLC_ROOT_PW:-password}"