diff --git a/paperless_ngx/CHANGELOG.md b/paperless_ngx/CHANGELOG.md index ff8a44a9e..51d10de28 100644 --- a/paperless_ngx/CHANGELOG.md +++ b/paperless_ngx/CHANGELOG.md @@ -2,6 +2,9 @@ ## 1.12.2 (04-02-2023) - Update to latest version from paperless-ngx/paperless-ngx +- Added consumption/media/data paths to addon config screen. + + ## 1.12.1 (28-01-2023) - Update to latest version from paperless-ngx/paperless-ngx diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index 9e7d526d8..642bae68c 100644 --- a/paperless_ngx/Dockerfile +++ b/paperless_ngx/Dockerfile @@ -40,11 +40,6 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi -ENV \ - PAPERLESS_DATA_DIR=/config/addons_config/paperless_ng \ - PAPERLESS_MEDIA_ROOT=/config/addons_config/paperless_ng/media \ - PAPERLESS_CONSUMPTION_DIR=/config/addons_config/paperless_ng/consume - # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh 90-config_yaml.sh" diff --git a/paperless_ngx/config.json b/paperless_ngx/config.json index 11f66bded..150eea030 100644 --- a/paperless_ngx/config.json +++ b/paperless_ngx/config.json @@ -85,6 +85,9 @@ "OCRLANG": "str?", "PAPERLESS_OCR_MODE": "list(skip|redo|force|skip_noarchive)?", "PAPERLESS_URL": "str?", + "PAPERLESS_DATA_DIR": "str?", + "PAPERLESS_MEDIA_ROOT": "str?", + "PAPERLESS_CONSUMPTION_DIR": "str?", "PGID": "int", "PUID": "int", "TZ": "str?", @@ -102,6 +105,6 @@ ], "slug": "paperless_ng", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "1.12.2", + "version": "1.12.2-1", "webui": "http://[HOST]:[PORT:8000]" } diff --git a/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh b/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh index d38fb5fb9..2bda57952 100755 --- a/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh +++ b/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh @@ -22,6 +22,20 @@ export PAPERLESS_ADMIN_PASSWORD="admin" export PAPERLESS_ADMIN_USER="admin" export PAPERLESS_ALLOWED_HOSTS="*" +export PAPERLESS_DATA_DIR="/config/addons_config/paperless_ng" +export PAPERLESS_MEDIA_ROOT="/config/addons_config/paperless_ng/media" +export PAPERLESS_CONSUMPTION_DIR="/config/addons_config/paperless_ng/consume" + +if bashio::config.has_value "PAPERLESS_DATA_DIR"; then export PAPERLESS_DATA_DIR=$(bashio::config "PAPERLESS_DATA_DIR"); fi +if bashio::config.has_value "PAPERLESS_MEDIA_ROOT"; then export PAPERLESS_MEDIA_ROOT=$(bashio::config "PAPERLESS_MEDIA_ROOT"); fi +if bashio::config.has_value "PAPERLESS_CONSUMPTION_DIR"; then export PAPERLESS_CONSUMPTION_DIR=$(bashio::config "PAPERLESS_CONSUMPTION_DIR"); fi + +for folder in "$PAPERLESS_DATA_DIR" "$PAPERLESS_MEDIA_ROOT" "$PAPERLESS_CONSUMPTION_DIR"; do + mkdir -p "$folder" + chmod -R 755 "$folder" + chown -R paperless:paperless "$folder" +done + ################### # Define database # ###################