diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a4eb19..facdb5f 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 2.6-7.6.10 2024-06-17 + + ### Added + - Rebuild of 2.6-7.6.9 + + ## 2.6-7.6.9 2024-05-23 ### Added diff --git a/Dockerfile b/Dockerfile index 5ab8148..5471e5d 100755 --- a/Dockerfile +++ b/Dockerfile @@ -44,35 +44,29 @@ RUN source /assets/functions/00-container && \ && \ \ package install .openldap-run-deps \ - aws-cli \ - bzip2 \ - cyrus-sasl \ - coreutils \ - cracklib \ - iptables \ - libevent \ - libltdl \ - libuuid \ - libintl \ - libsasl \ - libsodium \ - libuuid \ - openssl \ - perl \ - pigz \ - sed \ - tar \ - unixodbc \ - xz \ - zstd \ - && \ - \ - mkdir -p /usr/src/pixz && \ - curl -ssL https://github.com/vasi/pixz/releases/download/v1.0.7/pixz-1.0.7.tar.gz | tar xfz - --strip=1 -C /usr/src/pixz && \ - cd /usr/src/pixz && \ - ./configure && \ - make -j$(getconf _NPROCESSORS_ONLN) && \ - make install && \ + aws-cli \ + bzip2 \ + cyrus-sasl \ + coreutils \ + cracklib \ + iptables \ + libevent \ + libltdl \ + libuuid \ + libintl \ + libsasl \ + libsodium \ + libuuid \ + openssl \ + perl \ + pigz \ + pixz \ + sed \ + tar \ + unixodbc \ + xz \ + zstd \ + && \ \ mkdir -p /usr/src/pbzip2 && \ curl -ssL https://launchpad.net/pbzip2/1.1/1.1.13/+download/pbzip2-1.1.13.tar.gz | tar xfz - --strip=1 -C /usr/src/pbzip2 && \ diff --git a/install/assets/functions/10-openldap b/install/assets/functions/10-openldap index f295b4b..5cfa779 100755 --- a/install/assets/functions/10-openldap +++ b/install/assets/functions/10-openldap @@ -228,7 +228,7 @@ configure_ldap_server() { fi # setup bootstrap config - Part 1 - if [ -z "$(ls -A -I lost+found "${DB_PATH}")" ] && [ -z "$(ls -A -I lost+found "${CONFIG_PATH}"/slapd.d)" ]; then + if dir_empty "${DB_PATH}" && dir_empty "${CONFIG_PATH}"/slapd.d; then new_install=true print_warn "First time install detected" @@ -321,12 +321,12 @@ EOF chown -R ldap:ldap "${CONFIG_PATH}" # Error: the database directory (${DB_PATH}) is empty but not the config directory (${CONFIG_PATH}slapd.d) - elif [ -z "$(ls -A -I lost+found "${DB_PATH}")" ] && [ ! -z "$(ls -A -I lost+found "${CONFIG_PATH}"/slapd.d)" ]; then + elif dir_empty "${DB_PATH}" && dir_notempty "${CONFIG_PATH}"/slapd.d ; then print_error "The database directory (${DB_PATH}) is empty but not the config directory (${CONFIG_PATH}/slapd.d)" exit 1 # Error: the config directory (${CONFIG_PATH}slapd.d) is empty but not the database directory (${DB_PATH}) - elif [ ! -z "$(ls -A -I lost+found "${DB_PATH}")" ] && [ -z "$(ls -A -I lost+found "${CONFIG_PATH}"/slapd.d)" ]; then + elif dir_notempty "${DB_PATH}" && dir_empty "${CONFIG_PATH}" ; then print_error "The config directory (${CONFIG_PATH}/slapd.d) is empty but not the database directory (${DB_PATH})" exit 1 fi