From 5c13eef52dc4491959d23789482df3c28687f94a Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 10 Sep 2021 14:34:01 +0200 Subject: [PATCH] Update run.sh --- joal/rootfs/run.sh | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/joal/rootfs/run.sh b/joal/rootfs/run.sh index 683f78a4a..d657c5128 100644 --- a/joal/rootfs/run.sh +++ b/joal/rootfs/run.sh @@ -39,6 +39,20 @@ if bashio::supervisor.ping; then '-----------------------------------------------------------' fi + +##################### +# AUTOMATIC INGRESS # +##################### + +if bashio::config.has_value 'local_ip_port'; then + INGRESSURL=$(bashio::config 'local_ip_port')$(bashio::addon.ingress_url) + bashio::log.info $INGRESSURL + sed -i "s|/ui/|/ui?ui_credentials=%7B%22host%22%3A%22${INGRESSURL}%22%2C%22port%22%3A%228123%22%2C%22pathPrefix%22%3A%22${UIPATH}%22%2C%22secretToken%22%3A%22${TOKEN}%22%7D|g" /etc/nginx/servers/ingress.conf + bashio::log.info "Ingress url set. Auto connection activated." +else + bashio::log.info "Ingress url not set. Connection must be done manually." +fi + ################# # NGINX SETTING # ################# @@ -102,19 +116,6 @@ fi # Refresh symlink ln -sf /config/joal/config.json /data/joal/config.json -##################### -# AUTOMATIC INGRESS # -##################### - -if bashio::config.has_value 'local_ip_port'; then - INGRESSURL=$(bashio::config 'local_ip_port')$(bashio::addon.ingress_url) - bashio::log.info $INGRESSURL - sed -i "s|/ui/|/ui?ui_credentials=%7B%22host%22%3A%22${INGRESSURL}%22%2C%22port%22%3A%228123%22%2C%22pathPrefix%22%3A%22${UIPATH}%22%2C%22secretToken%22%3A%22${TOKEN}%22%7D|g" /etc/nginx/servers/ingress.conf - bashio::log.info "Ingress url set. Auto connection activated." -else - bashio::log.info "Ingress url not set. Connection must be done manually." -fi - ############### # LAUNCH APPS # ###############