From e488b96b098cf27ba8009d85c8abf08d3d8b6b38 Mon Sep 17 00:00:00 2001 From: Dave Conroy Date: Sat, 13 Feb 2021 10:19:01 -0800 Subject: [PATCH] Release 7.1.9 - See CHANGELOG.md --- CHANGELOG.md | 9 +++++++++ Dockerfile | 2 +- README.md | 15 ++++++++------- .../etc/services.available/20-openldap-backup/run | 4 ++-- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 314022c..82498dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## 7.1.9 2021-02-13 + + ### Added + - OpenLDAP 2.4.57 + + ### Changed + - Change /assets/custom-scripts/ location for executing post backups scripts to /assets/custom-backup-scripts/ + + ## 7.1.8 2021-01-14 ### Changed diff --git a/Dockerfile b/Dockerfile index acd4c6c..835260c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM tiredofit/alpine:3.13 LABEL maintainer="Dave Conroy " -ENV OPENLDAP_VERSION=2.4.56 \ +ENV OPENLDAP_VERSION=2.4.57 \ SCHEMA2LDIF_VERSION=1.3 \ ZABBIX_HOSTNAME=openldap-app \ ENABLE_CRON=FALSE \ diff --git a/README.md b/README.md index 1abb13c..1f9922a 100644 --- a/README.md +++ b/README.md @@ -93,13 +93,14 @@ __NOTE__: Please allow up to 2 minutes for the application to start for the firs The following directories are used for configuration and can be mapped for persistent storage. -| Directory | Description | -| ------------------------- | ------------------------------------------------------------------------------------------------------------------------ | -| `/var/lib/openldap` | Data Directory | -| `/etc/openldap/slapd.d` | Configuration Directory | -| `/assets/custom-scripts/` | If you'd like to execute a script during the initialization process drop it here (Useful for using this image as a base) | -| `/certs/` | Drop TLS Certificates here (or use your own path) | -| `/data/backup` | Backup Directory | +| Directory | Description | +| -------------------------------- | ------------------------------------------------------------------------------------------------------------------------ | +| `/var/lib/openldap` | Data Directory | +| `/etc/openldap/slapd.d` | Configuration Directory | +| `/assets/custom-scripts/` | If you'd like to execute a script during the initialization process drop it here (Useful for using this image as a base) | +| `/assets/custom-backup-scripts/` | If you'd like to execute a script after the backup process drop it here (Useful for using this image as a base) | +| `/certs/` | Drop TLS Certificates here (or use your own path) | +| `/data/backup` | Backup Directory | ### Environment Varables diff --git a/install/etc/services.available/20-openldap-backup/run b/install/etc/services.available/20-openldap-backup/run index 02bae35..524a5df 100755 --- a/install/etc/services.available/20-openldap-backup/run +++ b/install/etc/services.available/20-openldap-backup/run @@ -205,9 +205,9 @@ print_debug "Backup routines Initialized on $(date)" fi ### Post Backup Custom Script Support - if [ -d /assets/custom-scripts/ ] ; then + if [ -d /assets/custom-backup-scripts/ ] ; then print_notice "Found Custom Scripts to Execute" - for f in $(find /assets/custom-scripts/ -name \*.sh -type f); do + for f in $(find /assets/custom-backup-scripts/ -name \*.sh -type f); do print_notice "Running Script ${f}" ## script DATE TIME BACKUP_FILENAME FILESIZE MD5_VALUE ${f} "${now_date}" "${now_time}" "${target}" "${FILESIZE}" "${MD5VALUE}"