From df8cf7397cd0b2b885d14ad178f6c233abb5074d Mon Sep 17 00:00:00 2001 From: Alexandre Date: Fri, 18 Feb 2022 12:50:51 +0100 Subject: [PATCH] lint --- filebrowser/config.json | 5 +++-- filebrowser/rootfs/etc/cont-init.d/99-run.sh | 17 +++++------------ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/filebrowser/config.json b/filebrowser/config.json index bf1e1b569..0f758e58b 100644 --- a/filebrowser/config.json +++ b/filebrowser/config.json @@ -35,7 +35,9 @@ "/dev/nvme2" ], "environment": { - "FB_BASEURL": "/filebrowser" + "FB_BASEURL": "/filebrowser", + "PUID": "0", + "PGID": "0" }, "ingress": true, "ingress_port": 8099, @@ -82,4 +84,3 @@ "version": "2.20.1-2", "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]" } - diff --git a/filebrowser/rootfs/etc/cont-init.d/99-run.sh b/filebrowser/rootfs/etc/cont-init.d/99-run.sh index 9ac86ca5f..a8f4e20eb 100644 --- a/filebrowser/rootfs/etc/cont-init.d/99-run.sh +++ b/filebrowser/rootfs/etc/cont-init.d/99-run.sh @@ -15,22 +15,15 @@ else KEYFILE="" fi -#################### -# SET UID GID v1.0 # -#################### -bashio::log.info 'PUID GUID set to root' -PUID=0 -PGID=0 - ################# # NGINX SETTING # ################# -declare port -declare certfile +#declare port +#declare certfile declare ingress_interface declare ingress_port -declare keyfile +#declare keyfile FB_BASEURL=$(bashio::addon.ingress_entry) export FB_BASEURL @@ -41,7 +34,7 @@ if bashio::config.true 'ssl'; then ADDON_PROTOCOL=https fi -port=$(bashio::addon.port 80) +#port=$(bashio::addon.port 80) ingress_port=$(bashio::addon.ingress_port) ingress_interface=$(bashio::addon.ip_address) sed -i "s|%%protocol%%|${ADDON_PROTOCOL}|g" /etc/nginx/servers/ingress.conf @@ -83,7 +76,7 @@ fi bashio::log.info "Starting..." -/./filebrowser $CERTFILE $KEYFILE --root=$BASE_FOLDER --address=0.0.0.0 --database=/config/addons_config/filebrowser/filebrowser.dB $NOAUTH & +/./filebrowser "$CERTFILE" "$KEYFILE" --root="$BASE_FOLDER" --address=0.0.0.0 --database=/config/addons_config/filebrowser/filebrowser.dB "$NOAUTH" & bashio::net.wait_for 8080 localhost 900 || true bashio::log.info "Started !" exec nginx