public_git
/
bitnami-containers
mirror of https://github.com/bitnami/containers.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[bitnami/openldap] #49575 Move requiring TLS to the very end of the configuration and remove duplicate call to enable TLS (#51911) 

#49575 Move requiring TLS to the very end of the configuration and remove duplicate call to enable TLS. Requiring TLS prevents the various configuration upload functions from working and therefore it must be the last task run.

Signed-off-by: spresse1 <steve@pressers.name>
This commit is contained in:
Steven Presser 2023-11-06 17:05:50 +01:00 committed by GitHub
parent 6b53b3e668
commit d4db99ac35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bitnami/openldap/2.5/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh
View File

@ -612,9 +612,6 @@ ldap_initialize() {
if ! is_boolean_yes "$LDAP_ALLOW_ANON_BINDING"; then
ldap_disable_anon_binding
fi
if is_boolean_yes "$LDAP_ENABLE_TLS"; then
ldap_configure_tls
fi
# Initialize OpenLDAP with schemas/tree structure
if is_boolean_yes "$LDAP_ADD_SCHEMAS"; then
ldap_add_schemas
@ -640,13 +637,6 @@ ldap_initialize() {
if is_boolean_yes "$LDAP_ENABLE_SYNCPROV"; then
ldap_enable_syncprov
fi
# enable tls
if is_boolean_yes "$LDAP_ENABLE_TLS"; then
ldap_configure_tls
if is_boolean_yes "$LDAP_REQUIRE_TLS"; then
ldap_configure_tls_required
fi
fi
if ! is_dir_empty "$LDAP_CUSTOM_LDIF_DIR"; then
ldap_add_custom_ldifs
elif ! is_boolean_yes "$LDAP_SKIP_DEFAULT_TREE"; then
@ -654,6 +644,13 @@ ldap_initialize() {
else
info "Skipping default schemas/tree structure"
fi
# enable tls
if is_boolean_yes "$LDAP_ENABLE_TLS"; then
ldap_configure_tls
if is_boolean_yes "$LDAP_REQUIRE_TLS"; then
ldap_configure_tls_required
fi
fi
ldap_stop
fi
}

17
bitnami/openldap/2.6/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh
View File

@ -612,9 +612,6 @@ ldap_initialize() {
if ! is_boolean_yes "$LDAP_ALLOW_ANON_BINDING"; then
ldap_disable_anon_binding
fi
if is_boolean_yes "$LDAP_ENABLE_TLS"; then
ldap_configure_tls
fi
# Initialize OpenLDAP with schemas/tree structure
if is_boolean_yes "$LDAP_ADD_SCHEMAS"; then
ldap_add_schemas
@ -640,13 +637,6 @@ ldap_initialize() {
if is_boolean_yes "$LDAP_ENABLE_SYNCPROV"; then
ldap_enable_syncprov
fi
# enable tls
if is_boolean_yes "$LDAP_ENABLE_TLS"; then
ldap_configure_tls
if is_boolean_yes "$LDAP_REQUIRE_TLS"; then
ldap_configure_tls_required
fi
fi
if ! is_dir_empty "$LDAP_CUSTOM_LDIF_DIR"; then
ldap_add_custom_ldifs
elif ! is_boolean_yes "$LDAP_SKIP_DEFAULT_TREE"; then
@ -654,6 +644,13 @@ ldap_initialize() {
else
info "Skipping default schemas/tree structure"
fi
# enable tls
if is_boolean_yes "$LDAP_ENABLE_TLS"; then
ldap_configure_tls
if is_boolean_yes "$LDAP_REQUIRE_TLS"; then
ldap_configure_tls_required
fi
fi
ldap_stop
fi
}