Merge branch 'master' of https://github.com/alexbelgium/hassio-addons

.github/workflows/helper_stats_graphs.yaml

@@ -241,7 +241,7 @@ jobs:
           wget -S -O .github/stars2.svg https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons || \
           wget -S -O .github/stars2.svg https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=31 || true
           # Get stars evolution
-          wget -S -O .github/starsevol.svg https://api.star-history.com/svg?repos=alexbelgium/hassio-addons&type=Date
+          wget -S -O .github/starsevol.svg "https://api.star-history.com/svg?repos=alexbelgium/hassio-addons&type=Date"
       - name: Commit if needed
         uses: EndBug/add-and-commit@v9
         with:

fireflyiii_data_importer/CHANGELOG.md

@@ -1,3 +1,6 @@
+### version-1.2.2-2 (25-03-2023)
+- Minor bugs fixed
+- Allow IMPORT_DIR_ALLOWLIST
 
 ## version-1.2.2 (24-03-2023)
 - Update to latest version from fireflyiii/data-importer

fireflyiii_data_importer/config.json

@@ -40,6 +40,6 @@
   },
   "slug": "fireflyiii_data_importer",
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "version-1.2.2",
+  "version": "version-1.2.2-2",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]"
 }

fireflyiii_data_importer/rootfs/etc/cont-init.d/99-run.sh

@@ -14,6 +14,9 @@ if [ "$(ls -A "$CONFIGSOURCE/configurations")" ]; then
     export JSON_CONFIGURATION_DIR
 fi
 
+# Allow config dir
+export IMPORT_DIR_ALLOWLIST="$CONFIGSOURCE"
+
 ################
 # CRON OPTIONS #
 ################

nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh

@@ -56,12 +56,12 @@ elif [[ $($LAUNCHER -V 2>&1) == *"Nextcloud"* ]]; then
     bashio::log.green "--------------------------------------"
     bashio::log.green "Nextcloud $CURRENTVERSION is installed"
     bashio::log.green "--------------------------------------"
-# Is there an error
+    # Is there an error
 elif [[ $($LAUNCHER -V 2>&1) == *"Composer autoloader not found"* ]]; then
     bashio::log.red "--------------------------------------------------------"
     bashio::log.red "Issue in installation detected, Nextcloud will reinstall"
     bashio::log.red "--------------------------------------------------------"
-  touch /reinstall
+    touch /reinstall
 else
     bashio::log.red "------------------------------------------------------------------"
     bashio::log.red "Unknown error detected, please create issue in github or reinstall"
@@ -109,13 +109,13 @@ if [ -f /reinstall ]; then
         mkdir -p /app
         if [ -f /app/nextcloud.tar.bz2 ]; then rm /app/nextcloud.tar.bz2; fi
         curl -o /app/nextcloud.tar.bz2 -L "https://download.nextcloud.com/server/releases/nextcloud-${CURRENTVERSION}.tar.bz2" --progress-bar || \
-        (bashio::log.fatal "Your version doesn't exist... Please restore backup or fully uninstall addon" && exit 1)
+            (bashio::log.fatal "Your version doesn't exist... Please restore backup or fully uninstall addon" && exit 1)
     fi
 
     # Reinstall
     bashio::log.green "... reinstall ongoing, please wait"
     if [ -f /data/config/www/nextcloud/index.php ]; then rm /data/config/www/nextcloud/index.php; fi && \
-    /./etc/s6-overlay/s6-rc.d/init-nextcloud-config/run
+        /./etc/s6-overlay/s6-rc.d/init-nextcloud-config/run
 fi
 
 bashio::log.green "... done"

nextcloud/rootfs/etc/cont-init.d/30-ssl.sh

@@ -16,6 +16,6 @@ if bashio::config.true 'use_own_certs'; then
     [[ -f /data/config/keys/cert.crt ]] && rm /data/config/keys/cert.crt
     cp /ssl/"$CERTFILE" /data/config/keys/cert.crt
     cp /ssl/"$KEYFILE" /data/config/keys/cert.key
-    echo "... done"    
+    echo "... done"
 
 fi

qbittorrent/rootfs/etc/openvpn/up-qbittorrent.sh

@@ -5,4 +5,4 @@ WEBUI_PORT=${WEBUI_PORT:-8080}
 
 exec \
     s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost ${WEBUI_PORT}" \
-        s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}"
+    s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}"