From 817f66ae6466c612ff190f6d9b89cdbbef575958 Mon Sep 17 00:00:00 2001 From: plomosits Date: Thu, 21 Sep 2023 09:22:50 +0200 Subject: [PATCH] #49157 move adding custom ldifs or create tree to the end of the initial configuration section (#49271) Signed-off-by: Philipp Lomosits --- .../rootfs/opt/bitnami/scripts/libopenldap.sh | 14 +++++++------- .../rootfs/opt/bitnami/scripts/libopenldap.sh | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bitnami/openldap/2.5/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh b/bitnami/openldap/2.5/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh index 951ecf8b9345..2c500e4cb061 100644 --- a/bitnami/openldap/2.5/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh +++ b/bitnami/openldap/2.5/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh @@ -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 } diff --git a/bitnami/openldap/2.6/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh b/bitnami/openldap/2.6/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh index 951ecf8b9345..2c500e4cb061 100644 --- a/bitnami/openldap/2.6/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh +++ b/bitnami/openldap/2.6/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh @@ -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 }