avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-02-07 12:24:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correct

Browse Source
This commit is contained in:
Alexandre
2021-05-13 23:10:49 +02:00
committed by GitHub
parent 27f70d7dd8
commit be0f9a7808
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
joal/rootfs/run.sh
View File

@@ -37,23 +37,6 @@ if bashio::supervisor.ping; then
'-----------------------------------------------------------'
fi
#################
# 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
################
# JOAL SETTING #
################
@@ -86,6 +69,24 @@ rm /data/joal/jack-of*
bashio::log.info "Joal updated"
mv -f /config.json /data/joal/ || 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
sed -i "s/%%path%%/${PATH}/g" /etc/nginx/servers/ingress.conf
mkdir -p /var/log/nginx && touch /var/log/nginx/error.log
###############
# LAUNCH APPS #
###############
@@ -95,7 +96,7 @@ if [ $VERBOSE = true ]; then
else
nohup java -jar /joal/joal.jar --joal-conf=/data/joal --spring.main.web-environment=true --server.port="8081" --joal.ui.path.prefix=$PATH --joal.ui.secret-token=$TOKEN >/dev/null
fi \
& bashio::log.info "Joal started with secret token $TOKEN"
& bashio::log.info "Joal started with path $PATH and secret token $TOKEN"
# Wait for transmission to become available
bashio::net.wait_for 8081 localhost 900 || true
bashio::log.info "Nginx started for Ingress"