public_git/bitnami-containers
1
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-10-18 09:46:02 +02:00
Code Issues Projects Releases Wiki Activity

#49157 move adding custom ldifs or create tree to the end of the initial configuration section (#49271)

Browse Source 
Signed-off-by: Philipp Lomosits <p.lomosits@gmail.com>
This commit is contained in:
plomosits
2023-09-21 09:22:50 +02:00
committed by GitHub
parent 545bed5e63
commit 817f66ae64
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitnami/openldap/2.5/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh
+7 -7
View File
@@ -609,13 +609,6 @@ ldap_initialize() {
if ! is_dir_empty "$LDAP_CUSTOM_SCHEMA_DIR"; then
ldap_add_custom_schemas
fi
if ! is_dir_empty "$LDAP_CUSTOM_LDIF_DIR"; then
ldap_add_custom_ldifs
elif ! is_boolean_yes "$LDAP_SKIP_DEFAULT_TREE"; then
ldap_create_tree
else
info "Skipping default schemas/tree structure"
fi
# additional configuration
if [[ ! "$LDAP_PASSWORD_HASH" == "{SSHA}" ]]; then
ldap_configure_password_hash
@@ -630,6 +623,13 @@ ldap_initialize() {
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
ldap_create_tree
else
info "Skipping default schemas/tree structure"
fi
ldap_stop
fi
}
bitnami/openldap/2.6/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh
+7 -7
View File
@@ -609,13 +609,6 @@ ldap_initialize() {
if ! is_dir_empty "$LDAP_CUSTOM_SCHEMA_DIR"; then
ldap_add_custom_schemas
fi
if ! is_dir_empty "$LDAP_CUSTOM_LDIF_DIR"; then
ldap_add_custom_ldifs
elif ! is_boolean_yes "$LDAP_SKIP_DEFAULT_TREE"; then
ldap_create_tree
else
info "Skipping default schemas/tree structure"
fi
# additional configuration
if [[ ! "$LDAP_PASSWORD_HASH" == "{SSHA}" ]]; then
ldap_configure_password_hash
@@ -630,6 +623,13 @@ ldap_initialize() {
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
ldap_create_tree
else
info "Skipping default schemas/tree structure"
fi
ldap_stop
fi
}