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

Revert last working

Browse Source
This commit is contained in:
Alexandre
2021-05-14 10:13:06 +02:00
committed by GitHub
parent fcca80a704
commit 3bfd2eb33e
1 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
joal/rootfs/run.sh
View File

@@ -33,12 +33,27 @@ if bashio::supervisor.ping; then
' Please, share the above information when looking for help' ' Please, share the above information when looking for help'
bashio::log.blue \ bashio::log.blue \
' or support in, e.g., GitHub, forums or the Discord chat.' ' or support in, e.g., GitHub, forums or the Discord chat.'
bashio::log.blue \
' https://github.com/alexbelgium/hassio-addons'
bashio::log.blue \ bashio::log.blue \
'-----------------------------------------------------------' '-----------------------------------------------------------'
fi 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 # # JOAL SETTING #
################ ################
@@ -70,36 +85,16 @@ rm /data/joal/jack-of*
bashio::log.info "Joal updated" bashio::log.info "Joal updated"
mv -f /config.json /data/joal/ || true mv -f /config.json /data/joal/ || true
#################
# NGINX SETTING #
#################
declare port
declare certfile
declare ingress_interface
declare ingress_port
declare keyfile
PATH=$(bashio::config 'ui_path')
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 # # LAUNCH APPS #
############### ###############
if [ $VERBOSE = true ]; then if [ $VERBOSE = true ]; then
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 nohup java -jar /joal/joal.jar --joal-conf=/data/joal --spring.main.web-environment=true --server.port="8081" --joal.ui.path.prefix="joal" --joal.ui.secret-token=$TOKEN
else 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 nohup java -jar /joal/joal.jar --joal-conf=/data/joal --spring.main.web-environment=true --server.port="8081" --joal.ui.path.prefix="joal" --joal.ui.secret-token=$TOKEN >/dev/null
fi \ fi \
& bashio::log.info "Joal started with path $PATH and secret token $TOKEN" & bashio::log.info "Joal started with secret token $TOKEN"
# Wait for transmission to become available # Wait for transmission to become available
bashio::net.wait_for 8081 localhost 900 || true bashio::net.wait_for 8081 localhost 900 || true
bashio::log.info "Nginx started for Ingress" bashio::log.info "Nginx started for Ingress"