2.6 Release 7.2.14 - See CHANGELOG.md

tiredofit · Aug 7, 2022 · 534a0f1 · 534a0f1
1 parent 1f5917f
commit 534a0f1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 7.2.14 2022-08-06 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Minor tweak to loading custom scripts
+
+
 ## 7.2.13 2022-07-14 <dave at tiredofit dot ca>
 
    ### Changed

diff --git a/Dockerfile b/Dockerfile
@@ -44,6 +44,7 @@ RUN set -x && \
                 cyrus-sasl \
                 coreutils \
                 cracklib \
+                iptables \
                 libltdl \
                 libuuid \
                 libintl \

diff --git a/install/assets/functions/10-openldap b/install/assets/functions/10-openldap
@@ -550,11 +550,7 @@ EOF
 
       ## Execute Custom Scripts (To be used for example for tiredofit/openldap-fusiondirectory)
       if [ -d /assets/custom-scripts/ ]; then
-        print_notice "Found custom scripts to execute"
-        for f in $(find /assets/custom-scripts/ -name \*.sh -type f | sort); do
-          print_debug "Running Script ${f}"
-          ${f}
-        done
+        custom_scripts
       else
         if var_true "${ADD_DEFAULT_DATA}" ; then
           print_notice "Adding default top level data configuration"