From 691dbe9d7d56d6fe02a95f7c22f11e1bee428485 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 3 Aug 2021 08:43:57 +0200 Subject: [PATCH] Update run.sh --- cloudcommander/rootfs/run.sh | 37 ++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/cloudcommander/rootfs/run.sh b/cloudcommander/rootfs/run.sh index 825ebe9c4..06c37f737 100644 --- a/cloudcommander/rootfs/run.sh +++ b/cloudcommander/rootfs/run.sh @@ -128,19 +128,22 @@ fi || true ################# # NGINX SETTING # ################# -# -#declare port -#declare certfile -#declare ingress_interface -#declare ingress_port -#declare keyfile -# -#port=$(bashio::addon.port 80) -#ingress_port=$(bashio::addon.ingress_port) -#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 -#mkdir -p /var/log/nginx && touch /var/log/nginx/error.log + +declare port +declare certfile +declare ingress_interface +declare ingress_port +declare keyfile + +port=$(bashio::addon.port 80) +ingress_port=$(bashio::addon.ingress_port) +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 +mkdir -p /var/log/nginx && touch /var/log/nginx/error.log + +CLOUDCMD_PREFIX=$(bashio::config 'do_not_use') +export CLOUDCMD_PREFIX ############### # LAUNCH APPS # @@ -148,8 +151,6 @@ fi || true bashio::log.info "The server will start. Please wait 30 seconds before the web UI is available. Enjoy !" -./usr/src/app/bin/cloudcmd.mjs -#& bashio::net.wait_for 8080 localhost 900 || true -#bashio::log.info "Nginx started for Ingress" -#exec nginx - +./usr/src/app/bin/cloudcmd.mjs & bashio::net.wait_for 8080 localhost 900 || true +bashio::log.info "Nginx started for Ingress" +exec nginx