From e01a4a91d62e6d007df596947d82f81f9c10830f Mon Sep 17 00:00:00 2001 From: Alexandre Date: Wed, 28 Dec 2022 22:21:42 +0100 Subject: [PATCH] Allow url --- paperless_ngx/config.json | 4 +++- paperless_ngx/rootfs/etc/cont-init.d/31-nginx.sh | 7 +++++++ paperless_ngx/rootfs/etc/cont-init.d/99-run.sh | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/paperless_ngx/config.json b/paperless_ngx/config.json index c754932a0..ab2e79617 100644 --- a/paperless_ngx/config.json +++ b/paperless_ngx/config.json @@ -81,12 +81,14 @@ "schema": { "CONFIG_LOCATION": "str", "OCRLANG": "str?", + "PAPERLESS_URL": "str?", "PAPERLESS_OCR_MODE": "list(skip|redo|force|skip_noarchive)?", "PGID": "int", "PUID": "int", "TZ": "str?", "cifspassword": "str?", "cifsusername": "str?", + "database": "list(|sqlite|mariadb_addon)?", "localdisks": "str?", "networkdisks": "str?", "certfile": "str", @@ -99,5 +101,5 @@ "slug": "paperless_ng", "url": "https://github.com/alexbelgium/hassio-addons", "version": "1.10.2-5", - "webui": "[PROTO:ssl]://[HOST]:[PORT:8001]" + "webui": "[PROTO:ssl]://[HOST]:[PORT:8000]" } \ No newline at end of file diff --git a/paperless_ngx/rootfs/etc/cont-init.d/31-nginx.sh b/paperless_ngx/rootfs/etc/cont-init.d/31-nginx.sh index 2e50b55fc..774ecbe90 100644 --- a/paperless_ngx/rootfs/etc/cont-init.d/31-nginx.sh +++ b/paperless_ngx/rootfs/etc/cont-init.d/31-nginx.sh @@ -6,6 +6,13 @@ if bashio::config.true 'ssl'; then keyfile=$(bashio::config 'keyfile') sed -i "s#%%certfile%%#${certfile}#g" /etc/nginx/servers/direct.conf sed -i "s#%%keyfile%%#${keyfile}#g" /etc/nginx/servers/direct.conf + + if bashio::config.has_value "PAPERLESS_URL"; then + bashio::log.warning "Ssl enabled, your site will be available at $(bashio::config "PAPERLESS_URL"):$(bashio::addon.port 8000)" + else + bashio::log.fatal "PAPERLESS_URL not set, you won't be able to access your site (CSRF error)" + fi + else sed -i "s|default_server ssl|default_server|g" /etc/nginx/servers/direct.conf sed -i "/ssl/d" /etc/nginx/servers/direct.conf 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 effdbd5db..dc4c6ed09 100755 --- a/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh +++ b/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh @@ -11,6 +11,7 @@ bashio::log.info "Defining variables" if bashio::config.has_value "PUID"; then export USERMAP_UID=$(bashio::config "PUID"); fi if bashio::config.has_value "PGID"; then export USERMAP_GID=$(bashio::config "PGID"); fi if bashio::config.has_value "TZ"; then export PAPERLESS_TIME_ZONE=$(bashio::config "TZ"); fi +if bashio::config.has_value "PAPERLESS_URL"; then export PAPERLESS_URL=$(bashio::config "PAPERLESS_URL"); fi if bashio::config.has_value "OCRLANG"; then PAPERLESS_OCR_LANGUAGES="$(bashio::config "OCRLANG")" export PAPERLESS_OCR_LANGUAGES=${PAPERLESS_OCR_LANGUAGES,,}