Restore

fireflyiii_data_importer/CHANGELOG.md

@@ -1,4 +1,9 @@
 
+## 1.3.9 (04-11-2023)
+- Update to latest version from firefly-iii/data-importer
+## 1.3.9 (01-11-20223)
+- Adds config to allow automation
+
 ## 1.3.8 (02-09-2023)
 - Update to latest version from firefly-iii/data-importer
 

fireflyiii_data_importer/Dockerfile

@@ -16,7 +16,7 @@
 
 ARG BUILD_FROM
 ARG BUILD_VERSION
-ARG BUILD_UPSTREAM="1.3.8"
+ARG BUILD_UPSTREAM="1.3.9"
 FROM ${BUILD_FROM}
 
 ##################
@@ -46,15 +46,15 @@ COPY rootfs/ /
 ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh 01-config_yaml.sh"
 
 # Automatic modules download
-ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh"
-RUN /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh"
+RUN chmod 744 /ha_automodules.sh && /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh
 
 # Manual apps
 ENV PACKAGES="cron"
 
 # Automatic apps & bashio
-ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh"
-RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh"
+RUN chmod 744 /ha_autoapps.sh && /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh
 
 ################
 # 4 Entrypoint #
@@ -62,11 +62,11 @@ RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh
 
 # Add entrypoint
 ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
-ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Entrypoint modifications
-ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint_modif.sh" "/ha_entrypoint_modif.sh"
-RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint_modif.sh" "/ha_entrypoint_modif.sh"
+RUN chmod 777 /ha_entrypoint.sh /ha_entrypoint_modif.sh && /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh
 
 
 ENTRYPOINT [ "/usr/bin/env" ]

fireflyiii_data_importer/config.json

@@ -78,6 +78,9 @@
     "8080/tcp": "web interface"
   },
   "schema": {
+    "AUTO_IMPORT_SECRET": "str?",
+    "CAN_POST_AUTOIMPORT": "bool?",
+    "CAN_POST_FILES": "bool?",
     "CONFIG_LOCATION": "str",
     "FIREFLY_III_ACCESS_TOKEN": "str",
     "FIREFLY_III_CLIENT_ID": "str?",
@@ -92,6 +95,6 @@
   "slug": "fireflyiii_data_importer",
   "udev": true,
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]"
 }

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

@@ -19,6 +19,13 @@ fi
 export IMPORT_DIR_ALLOWLIST="$CONFIGSOURCE"
 export IMPORT_DIR_WHITELIST="${CONFIGSOURCE}/import_files"
 
+# shellcheck disable=SC2155
+export AUTO_IMPORT_SECRET="$(bashio::config "AUTO_IMPORT_SECRET")"
+# shellcheck disable=SC2155
+export CAN_POST_FILES="$(bashio::config "CAN_POST_FILES")"
+# shellcheck disable=SC2155
+export CAN_POST_AUTOIMPORT="$(bashio::config "CAN_POST_AUTOIMPORT")"
+
 ################
 # CRON OPTIONS #
 ################

fireflyiii_data_importer/updater.json

@@ -1,8 +1,8 @@
 {
-  "last_update": "02-09-2023",
+  "last_update": "04-11-2023",
   "repository": "alexbelgium/hassio-addons",
   "slug": "fireflyiii_data_importer",
   "source": "github",
   "upstream_repo": "firefly-iii/data-importer",
-  "upstream_version": "1.3.8"
+  "upstream_version": "1.3.9"
 }