Release 2.6-7.5.0 - See CHANGELOG.md

tiredofit · Apr 26, 2023 · 236fdef · 236fdef
1 parent 85e21fb
commit 236fdef
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 2.6-7.5.0 2023-04-26 <dave at tiredofit dot ca>
+
+   ### Added
+      - Add support for _FILE environment variables
+
+
 ## 2.6-7.4.2 2023-04-21 <dave at tiredofit dot ca>
 
    ### Changed

diff --git a/install/assets/functions/10-openldap b/install/assets/functions/10-openldap
@@ -217,12 +217,12 @@ configure_ldap_server() {
     if [ ! -e "$first_start_done" ]; then
         new_install=false
 
-        transform_var \
+        transform_file_var \
                         ADMIN_PASS \
                         CONFIG_PASS
 
         if var_true "${ENABLE_READONLY_USER}"; then
-            transform_var \
+            transform_file_var \
                             READONLY_USER_USER \
                             READONLY_USER_PASS
         fi
@@ -537,7 +537,7 @@ EOF
                 print_notice "Configuring replication"
                 replication_disable || true
 
-                transform_var \
+                transform_file_var \
                                 REPLICATION_HOSTS \
                                 REPLICATION_HOSTS_CONFIG_SYNC_PROV \
                                 REPLICATION_HOSTS_DB_SYNC_PROV

diff --git a/install/assets/slapd/config/bootstrap/default/default.sh b/install/assets/slapd/config/bootstrap/default/default.sh
@@ -29,7 +29,7 @@ for elem in "${domain_elems[@]}" ; do
     fi
 done
 
-transform_var \
+transform_file_var \
                 ADMIN_PASS \
                 READONLY_USER_USER
                 READONLY_USER_PASS

diff --git a/install/etc/services.available/20-openldap-backup/run b/install/etc/services.available/20-openldap-backup/run
@@ -8,7 +8,7 @@ check_service_initialized init 10-openldap
 liftoff
 
 if [ "${BACKUP_LOCATION}" = "s3" ] || [ "${BACKUP_LOCATION}" = "minio" ]; then
-    transform_var \
+    transform_file_var \
                     S3_BUCKET \
                     S3_KEY_ID \
                     S3_KEY_SECRET \

diff --git a/install/etc/zabbix/zabbix_agentd.conf.d/scripts/openldap-stats.sh b/install/etc/zabbix/zabbix_agentd.conf.d/scripts/openldap-stats.sh
@@ -13,7 +13,7 @@ if [ -z "${BASE_DN}" ]; then
     BASE_DN=${BASE_DN::-1}
 fi
 
-transform_var \
+transform_file_var \
                 ADMIN_PASS
 
 #dynamic