From 56151da67dcd50e95daaae642c23fc937bd84807 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 5 Jan 2026 13:31:56 +0100 Subject: [PATCH] Prefill Joal ingress credentials --- joal/rootfs/etc/cont-init.d/99-run.sh | 7 +++++++ joal/rootfs/etc/nginx/servers/ingress.conf | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/joal/rootfs/etc/cont-init.d/99-run.sh b/joal/rootfs/etc/cont-init.d/99-run.sh index 9f93ea233..0d32ec7a7 100755 --- a/joal/rootfs/etc/cont-init.d/99-run.sh +++ b/joal/rootfs/etc/cont-init.d/99-run.sh @@ -73,6 +73,12 @@ UIPATH=$(bashio::config 'ui_path') #port=$(bashio::addon.port 80) ingress_port=$(bashio::addon.ingress_port) ingress_interface=$(bashio::addon.ip_address) +ui_credentials_json=$(jq -n --arg host "${host_ip}:${host_port}${ingress_url}/" \ + --arg port "${host_port}" \ + --arg pathPrefix "${UIPATH}" \ + --arg secretToken "${TOKEN}" \ + '{host:$host,port:$port,pathPrefix:$pathPrefix,secretToken:$secretToken}') +ui_credentials_encoded=$(printf '%s' "$ui_credentials_json" | jq -sRr @uri) ################# # NGINX SETTING # @@ -90,6 +96,7 @@ ingress_interface=$(bashio::addon.ip_address) sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf sed -i "s/%%path%%/${UIPATH}/g" /etc/nginx/servers/ingress.conf +sed -i "s|%%ui_credentials%%|${ui_credentials_encoded}|g" /etc/nginx/servers/ingress.conf mkdir -p /var/log/nginx && touch /var/log/nginx/error.log ############### diff --git a/joal/rootfs/etc/nginx/servers/ingress.conf b/joal/rootfs/etc/nginx/servers/ingress.conf index eac43b228..06673e09f 100644 --- a/joal/rootfs/etc/nginx/servers/ingress.conf +++ b/joal/rootfs/etc/nginx/servers/ingress.conf @@ -12,7 +12,7 @@ server { proxy_connect_timeout 30m; proxy_send_timeout 30m; proxy_read_timeout 30m; - proxy_pass http://backend/%%path%%/ui/; + proxy_pass http://backend/%%path%%/ui?ui_credentials=%%ui_credentials%%; } location /:8123/ {