support for additional config files

README.md

@@ -270,6 +270,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **03.11.21:** - Added more support for potential config files.
 * **31.10.21:** - Added xpack.security variable to ElasticSearch; added instructions to edit Constants.php in diskover; corrected command needed to manually generate an index in diskover
 * **11.10.21:** - Updated to diskover-community v2.
 * **19.11.20:** - Fix pip packages.

readme-vars.yml

@@ -94,7 +94,11 @@ app_setup_block: |
 
 # changelog
 changelogs:
+<<<<<<< HEAD
   - { date: "31.10.21:", desc: "Added xpack.security variable to ElasticSearch; added instructions to edit Constants.php in diskover; corrected command needed to manually generate an index in diskover" }
+=======
+  - { date: "03.11.21:", desc: "Added more support for potential config files." }
+>>>>>>> support for additional config files
   - { date: "11.10.21:", desc: "Updated to diskover-community v2." }
   - { date: "19.11.20:", desc: "Fix pip packages." }
   - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }

root/etc/cont-init.d/52-config-diskover-web

@@ -14,6 +14,16 @@ for file in *.sample; do
     ln -sf /config/diskover-web.conf.d/$dest /app/www/public/$dest
 done
 
+cd /app/www/public/tasks
+for file in *.sample; do
+    dest=${file%.sample}
+
+    [[ ! -e "/config/diskover-web.conf.d/$dest" ]] && \
+        cp /app/www/public/tasks/$file /config/diskover-web.conf.d/$dest
+
+    ln -sf /config/diskover-web.conf.d/$dest /app/www/public/tasks/$dest
+done
+
 # copy and set variables in Constants.php
 if [[ ! -e "/config/diskover-web.conf.d/Constants.php" ]]; then
     cp /app/www/src/diskover/Constants.php.sample /config/diskover-web.conf.d/Constants.php