Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4754794968 | ||
|
|
e7f6d78e89 | ||
|
|
74c6042a9e |
No files matched your search
@@ -22,6 +22,7 @@ username,country
|
||||
9turnbull,
|
||||
A-n-k-a,
|
||||
ABAJNOK,
|
||||
ADVENTURER08,
|
||||
AFreiling,
|
||||
AFumi39,
|
||||
ATLAS-IND-Software,
|
||||
@@ -182,6 +183,7 @@ DeltaAngle,
|
||||
DenisKevljanin,
|
||||
DennisKae,Germany
|
||||
Depechie,Belgium
|
||||
DerDaehne,
|
||||
DerFelixPlayer2,Austria
|
||||
DerRemo,
|
||||
Devinyl,
|
||||
@@ -266,6 +268,7 @@ Germaenace,
|
||||
Getrio,Italy
|
||||
Ghost-Sam1222,
|
||||
GiacoAV,
|
||||
GianlucaCise,
|
||||
Giga77,
|
||||
GleDel,
|
||||
GlebYavorski,
|
||||
@@ -616,6 +619,7 @@ RubenKelevra,Germany
|
||||
Rudi-Schmudi,
|
||||
RudiKlein,Netherlands
|
||||
RudyDevroey,
|
||||
RusikOk,Ukraine
|
||||
Ryan68,
|
||||
RymenTe,
|
||||
SALIMKHALID1,
|
||||
@@ -750,6 +754,7 @@ VfBfoerst,
|
||||
ViPeR5000,Portugal
|
||||
Vikinge,
|
||||
ViorelMocanu,Romania
|
||||
Viszokit,
|
||||
VladDBA,Romania
|
||||
Vladislaf70,
|
||||
VortexP,Finland
|
||||
@@ -820,6 +825,7 @@ ajtatum,United States
|
||||
ajxcorrea,
|
||||
ak-flash,
|
||||
akalagov,Kazakhstan
|
||||
akerfonta,
|
||||
akmzero,
|
||||
akrigator,
|
||||
alberttimmers,
|
||||
@@ -1139,6 +1145,7 @@ dan81andrei,
|
||||
danbruno,
|
||||
danctrl,Germany
|
||||
danez,United States
|
||||
danieldotnl,Netherlands
|
||||
dannybeeckman,
|
||||
dannybloomfield,
|
||||
danveitch76,
|
||||
@@ -1312,7 +1319,7 @@ fcastilloec,
|
||||
fctgcoder,
|
||||
felipecrs,Brazil
|
||||
fenteac,
|
||||
fenyag7,
|
||||
fenyag7,Germany
|
||||
fermuch,
|
||||
fernbrun,
|
||||
fess1100,
|
||||
@@ -1425,7 +1432,7 @@ h3llrais3r,Belgium
|
||||
h47e,
|
||||
hAxxelS,
|
||||
ha48653,
|
||||
habiwan,
|
||||
habiwan,United States
|
||||
habuild,
|
||||
hafstaf,
|
||||
hank-droid,
|
||||
@@ -1634,6 +1641,7 @@ kayserlein,Germany
|
||||
kcbergmo,
|
||||
kcm117,United States
|
||||
keefey,Australia
|
||||
keikoro,
|
||||
keithcroshaw,
|
||||
kelvinng1,
|
||||
kenaner,
|
||||
@@ -1641,6 +1649,7 @@ kenguest,Ireland
|
||||
kennelbound,
|
||||
kfrncs85,United States
|
||||
khaled-nabil,Germany
|
||||
kherlen,
|
||||
kid941005,
|
||||
kikuman,
|
||||
kilian112233,
|
||||
@@ -2344,6 +2353,7 @@ tbrasser,Netherlands
|
||||
tdn131,
|
||||
tdubu,
|
||||
tech2mar,Germany
|
||||
technerd9000,United Kingdom
|
||||
techniker,Germany
|
||||
techris45,United States
|
||||
tednilsen,Norway
|
||||
|
||||
|
|
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 61 KiB |
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 6.2 KiB |
@@ -26,14 +26,14 @@ if ! bashio::supervisor.ping 2>/dev/null; then
|
||||
done
|
||||
else
|
||||
bashio::log.blue '-----------------------------------------------------------'
|
||||
bashio::log.blue " Add-on: $(bashio::addon.name)"
|
||||
bashio::log.blue " $(bashio::addon.description)"
|
||||
bashio::log.blue " Add-on: $(bashio::app.name)"
|
||||
bashio::log.blue " $(bashio::app.description)"
|
||||
bashio::log.blue '-----------------------------------------------------------'
|
||||
|
||||
bashio::log.blue " Add-on version: $(bashio::addon.version)"
|
||||
if bashio::var.true "$(bashio::addon.update_available)"; then
|
||||
bashio::log.blue " Add-on version: $(bashio::app.version)"
|
||||
if bashio::var.true "$(bashio::app.update_available)"; then
|
||||
bashio::log.magenta " There is an update available!"
|
||||
bashio::log.magenta " Latest version: $(bashio::addon.version_latest)"
|
||||
bashio::log.magenta " Latest version: $(bashio::app.version_latest)"
|
||||
else
|
||||
bashio::log.green " You are running the latest version."
|
||||
fi
|
||||
|
||||
@@ -105,7 +105,7 @@ if bashio::config.has_value 'localdisks'; then
|
||||
|| (
|
||||
bashio::log.fatal "Unable to mount local drives! Please check the name."
|
||||
rmdir /mnt/"$disk"
|
||||
bashio::addon.stop
|
||||
bashio::app.stop
|
||||
)
|
||||
done
|
||||
|
||||
|
||||
@@ -327,7 +327,7 @@ if bashio::config.has_value 'networkdisks'; then
|
||||
bashio::log.fatal "...... incorrect Username, Password, or Domain! Script will stop."
|
||||
cleanup_cred
|
||||
rm -f "$ERRORCODE_FILE" 2>/dev/null || true
|
||||
bashio::addon.stop
|
||||
bashio::app.stop
|
||||
elif echo "$OUTPUT" | grep -q "tree connect failed" || echo "$OUTPUT" | grep -q "NT_STATUS_CONNECTION_DISCONNECTED"; then
|
||||
echo "... using SMBv1"
|
||||
bashio::log.warning "...... share reachable only with legacy SMBv1 (NT1) negotiation. Forcing SMBv1 options."
|
||||
@@ -467,7 +467,7 @@ if bashio::config.has_value 'networkdisks'; then
|
||||
cleanup_cred
|
||||
rm -f "$ERRORCODE_FILE" 2>/dev/null || true
|
||||
|
||||
bashio::addon.stop
|
||||
bashio::app.stop
|
||||
fi
|
||||
done
|
||||
fi
|
||||
@@ -62,7 +62,7 @@ if [[ "$CONFIGLOCATION" == "/config" ]]; then
|
||||
fi
|
||||
# Migrate option
|
||||
if [[ "$(bashio::config "CONFIG_LOCATION")" == "/config/addons_config"* ]] && [ -f /config/config.yaml ]; then
|
||||
bashio::addon.option "CONFIG_LOCATION" "/config/config.yaml"
|
||||
bashio::app.option "CONFIG_LOCATION" "/config/config.yaml"
|
||||
CONFIGSOURCE="/config/config.yaml"
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -50,7 +50,7 @@ SHEBANG_ERRORS=()
|
||||
probe_script_content='
|
||||
set -e
|
||||
|
||||
if ! command -v bashio::addon.version >/dev/null 2>&1; then
|
||||
if ! command -v bashio::app.version >/dev/null 2>&1; then
|
||||
for f in \
|
||||
/usr/lib/bashio/bashio.sh \
|
||||
/usr/lib/bashio/lib.sh \
|
||||
@@ -66,7 +66,7 @@ if ! command -v bashio::addon.version >/dev/null 2>&1; then
|
||||
fi
|
||||
|
||||
set +e
|
||||
_bv="$(bashio::addon.version 2>/dev/null)"
|
||||
_bv="$(bashio::app.version 2>/dev/null)"
|
||||
_rc=$?
|
||||
set -e
|
||||
|
||||
@@ -75,7 +75,7 @@ if [ "$_rc" -ne 0 ] || [ -z "$_bv" ] || [ "$_bv" = "null" ]; then
|
||||
if [ -f "$_sf" ]; then
|
||||
# shellcheck disable=SC1090
|
||||
. "$_sf"
|
||||
_bv="$(bashio::addon.version 2>/dev/null || true)"
|
||||
_bv="$(bashio::app.version 2>/dev/null || true)"
|
||||
break
|
||||
fi
|
||||
done
|
||||
@@ -147,7 +147,7 @@ if [ -z "$shebang" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if ! command -v bashio::addon.version >/dev/null 2>&1; then
|
||||
if ! command -v bashio::app.version >/dev/null 2>&1; then
|
||||
for f in /usr/lib/bashio/bashio.sh /usr/lib/bashio/lib.sh /usr/src/bashio/bashio.sh /usr/local/lib/bashio/bashio.sh /usr/local/lib/bashio-standalone.sh; do
|
||||
if [ -f "$f" ]; then
|
||||
# shellcheck disable=SC1090
|
||||
|
||||
@@ -202,6 +202,13 @@ bashio::addon.port() {
|
||||
fi
|
||||
}
|
||||
|
||||
# addon.ingress_url : HA Supervisor provides this; in standalone mode return empty
|
||||
bashio::addon.ingress_url() { printf '%s' "${ADDON_INGRESS_URL:-}"; }
|
||||
|
||||
# addon.restart / addon.stop : no-ops in standalone (no Supervisor to call)
|
||||
bashio::addon.restart() { bashio::log.warning "bashio::app.restart called in standalone mode – no-op"; }
|
||||
bashio::addon.stop() { bashio::log.warning "bashio::app.stop called in standalone mode – no-op"; }
|
||||
|
||||
# addon.option : write/delete option in JSON when possible; fallback export env
|
||||
bashio::addon.option() {
|
||||
local key="${1:-}" value="${2-__BASHIO_UNSET__}" file="${STANDALONE_OPTIONS_JSON:-}"
|
||||
@@ -432,3 +439,22 @@ bashio::core.check() {
|
||||
return 0
|
||||
fi
|
||||
}
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# bashio::app.* — forward-compat aliases for the new API (replaces addon.*)
|
||||
# Scripts should use bashio::app.* going forward; bashio::addon.* is kept for
|
||||
# backward compatibility with older bashio installations.
|
||||
# -----------------------------------------------------------------------------
|
||||
bashio::app.name() { bashio::addon.name "$@"; }
|
||||
bashio::app.description() { bashio::addon.description "$@"; }
|
||||
bashio::app.version() { bashio::addon.version "$@"; }
|
||||
bashio::app.version_latest() { bashio::addon.version_latest "$@"; }
|
||||
bashio::app.update_available(){ bashio::addon.update_available "$@"; }
|
||||
bashio::app.ingress_port() { bashio::addon.ingress_port "$@"; }
|
||||
bashio::app.ingress_entry() { bashio::addon.ingress_entry "$@"; }
|
||||
bashio::app.ingress_url() { bashio::addon.ingress_url "$@"; }
|
||||
bashio::app.ip_address() { bashio::addon.ip_address "$@"; }
|
||||
bashio::app.port() { bashio::addon.port "$@"; }
|
||||
bashio::app.option() { bashio::addon.option "$@"; }
|
||||
bashio::app.restart() { bashio::addon.restart "$@"; }
|
||||
bashio::app.stop() { bashio::addon.stop "$@"; }
|
||||
@@ -68,7 +68,7 @@ SHEBANG_ERRORS=()
|
||||
probe_script_content='
|
||||
set -e
|
||||
|
||||
if ! command -v bashio::addon.version >/dev/null 2>&1; then
|
||||
if ! command -v bashio::app.version >/dev/null 2>&1 && ! command -v bashio::addon.version >/dev/null 2>&1; then
|
||||
for f in \
|
||||
/usr/lib/bashio/bashio.sh \
|
||||
/usr/lib/bashio/lib.sh \
|
||||
@@ -83,9 +83,13 @@ if ! command -v bashio::addon.version >/dev/null 2>&1; then
|
||||
done
|
||||
fi
|
||||
|
||||
# Try regular bashio, fallback to standalone if unavailable or fails
|
||||
# Try bashio::app.version (new API), fall back to bashio::addon.version (old API)
|
||||
set +e
|
||||
_bv="$(bashio::addon.version 2>/dev/null)"
|
||||
if command -v bashio::app.version >/dev/null 2>&1; then
|
||||
_bv="$(bashio::app.version 2>/dev/null)"
|
||||
else
|
||||
_bv="$(bashio::addon.version 2>/dev/null)"
|
||||
fi
|
||||
_rc=$?
|
||||
set -e
|
||||
|
||||
@@ -94,7 +98,11 @@ if [ "$_rc" -ne 0 ] || [ -z "$_bv" ] || [ "$_bv" = "null" ]; then
|
||||
if [ -f "$_sf" ]; then
|
||||
# shellcheck disable=SC1090
|
||||
. "$_sf"
|
||||
_bv="$(bashio::addon.version 2>/dev/null || true)"
|
||||
if command -v bashio::app.version >/dev/null 2>&1; then
|
||||
_bv="$(bashio::app.version 2>/dev/null || true)"
|
||||
else
|
||||
_bv="$(bashio::addon.version 2>/dev/null || true)"
|
||||
fi
|
||||
break
|
||||
fi
|
||||
done
|
||||
@@ -158,7 +166,7 @@ for candidate in "${candidate_shebangs[@]}"; do
|
||||
done
|
||||
|
||||
if [ -z "$shebang" ]; then
|
||||
echo "ERROR: No valid shebang found (unable to execute bashio::addon.version via candidates)." >&2
|
||||
echo "ERROR: No valid shebang found (unable to execute bashio::app.version / bashio::addon.version via candidates)." >&2
|
||||
echo "Tried:" >&2
|
||||
printf ' - %s\n' "${candidate_shebangs[@]}" >&2
|
||||
if [ "${#SHEBANG_ERRORS[@]}" -gt 0 ]; then
|
||||
@@ -192,6 +200,15 @@ fi
|
||||
# Starting scripts #
|
||||
####################
|
||||
|
||||
# Inject a backward-compat shim after the shebang so scripts using bashio::app.*
|
||||
# also work on older bashio installations that only provide bashio::addon.*.
|
||||
# On new bashio the guard (command -v bashio::app.version) is true and the block is skipped.
|
||||
_BASHIO_COMPAT_SHIM='command -v bashio::app.version >/dev/null 2>&1 || { bashio::app.version(){ bashio::addon.version "$@"; }; bashio::app.name(){ bashio::addon.name "$@"; }; bashio::app.description(){ bashio::addon.description "$@"; }; bashio::app.version_latest(){ bashio::addon.version_latest "$@"; }; bashio::app.update_available(){ bashio::addon.update_available "$@"; }; bashio::app.ingress_port(){ bashio::addon.ingress_port "$@"; }; bashio::app.ingress_entry(){ bashio::addon.ingress_entry "$@"; }; bashio::app.ingress_url(){ bashio::addon.ingress_url "$@"; }; bashio::app.ip_address(){ bashio::addon.ip_address "$@"; }; bashio::app.port(){ bashio::addon.port "$@"; }; bashio::app.option(){ bashio::addon.option "$@"; }; bashio::app.restart(){ bashio::addon.restart "$@"; }; bashio::app.stop(){ bashio::addon.stop "$@"; }; }'
|
||||
|
||||
_inject_bashio_compat() {
|
||||
sed -i "1a $_BASHIO_COMPAT_SHIM" "$1"
|
||||
}
|
||||
|
||||
run_one_script() {
|
||||
local script="$1"
|
||||
|
||||
@@ -207,6 +224,7 @@ run_one_script() {
|
||||
fi
|
||||
|
||||
sed -i "1s|^.*|#!$shebang|" "$script"
|
||||
_inject_bashio_compat "$script"
|
||||
chmod +x "$script"
|
||||
|
||||
if [ "${ha_entry_source:-null}" = "true" ]; then
|
||||
@@ -251,6 +269,7 @@ if $PID1; then
|
||||
[ -f "$runfile" ] || continue
|
||||
echo "Starting: $runfile"
|
||||
sed -i "1s|^.*|#!$shebang|" "$runfile"
|
||||
_inject_bashio_compat "$runfile"
|
||||
chmod +x "$runfile"
|
||||
(
|
||||
restart_count=0
|
||||
|
||||
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 1.3 KiB |
@@ -8,9 +8,9 @@ set -e
|
||||
declare ingress_interface
|
||||
declare ingress_port
|
||||
|
||||
ingress_port=$(bashio::addon.ingress_port)
|
||||
ingress_interface=$(bashio::addon.ip_address)
|
||||
ingress_entry=$(bashio::addon.ingress_entry)
|
||||
ingress_port=$(bashio::app.ingress_port)
|
||||
ingress_interface=$(bashio::app.ip_address)
|
||||
ingress_entry=$(bashio::app.ingress_entry)
|
||||
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|%%ingress_entry%%|${ingress_entry}|g" /etc/nginx/servers/ingress.conf
|
||||
|
||||
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 1.6 KiB |
@@ -8,9 +8,9 @@ set -e
|
||||
declare ingress_interface
|
||||
declare ingress_port
|
||||
|
||||
ingress_port=$(bashio::addon.ingress_port)
|
||||
ingress_interface=$(bashio::addon.ip_address)
|
||||
ingress_entry=$(bashio::addon.ingress_entry)
|
||||
ingress_port=$(bashio::app.ingress_port)
|
||||
ingress_interface=$(bashio::app.ip_address)
|
||||
ingress_entry=$(bashio::app.ingress_entry)
|
||||
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|%%ingress_entry%%|${ingress_entry}|g" /etc/nginx/servers/ingress.conf
|
||||
|
||||
@@ -18,7 +18,7 @@ if [ -f "$CONFIG_LOCATION" ]; then
|
||||
if ! grep -q "base_url.*$slug" "$CONFIG_LOCATION"; then
|
||||
bashio::log.warning "BaseUrl not set properly, restarting"
|
||||
sed -i "s/ base_url:.*/ base_url: $slug/" "$CONFIG_LOCATION"
|
||||
bashio::addon.restart
|
||||
bashio::app.restart
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 1.3 KiB |
@@ -8,9 +8,9 @@ set -e
|
||||
declare ingress_interface
|
||||
declare ingress_port
|
||||
|
||||
ingress_port="$(bashio::addon.ingress_port)"
|
||||
ingress_interface="$(bashio::addon.ip_address)"
|
||||
ingress_entry=$(bashio::addon.ingress_entry)
|
||||
ingress_port="$(bashio::app.ingress_port)"
|
||||
ingress_interface="$(bashio::app.ip_address)"
|
||||
ingress_entry=$(bashio::app.ingress_entry)
|
||||
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|%%ingress_entry%%|${ingress_entry}|g" /etc/nginx/servers/ingress.conf
|
||||
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 1.7 KiB |
@@ -10,9 +10,9 @@ declare ingress_interface
|
||||
declare ingress_port
|
||||
|
||||
echo "Adapting for ingress"
|
||||
ingress_port=$(bashio::addon.ingress_port)
|
||||
ingress_interface=$(bashio::addon.ip_address)
|
||||
ingress_entry=$(bashio::addon.ingress_entry)
|
||||
ingress_port=$(bashio::app.ingress_port)
|
||||
ingress_interface=$(bashio::app.ip_address)
|
||||
ingress_entry=$(bashio::app.ingress_entry)
|
||||
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|%%ingress_entry%%|${ingress_entry}|g" /etc/nginx/servers/ingress.conf
|
||||
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 1.5 KiB |
@@ -47,7 +47,7 @@ done
|
||||
# CHECK PORT #
|
||||
##############
|
||||
|
||||
if [[ "$(bashio::addon.port "80")" == 3000 ]]; then
|
||||
if [[ "$(bashio::app.port "80")" == 3000 ]]; then
|
||||
bashio::log.fatal "This is crazy but your port is set to 3000 and streamlit doesn't accept this port! You need to change it from the addon options and restart. Thanks"
|
||||
sleep infinity
|
||||
fi
|
||||
|
||||
@@ -34,7 +34,7 @@ if bashio::supervisor.ping 2> /dev/null; then
|
||||
done
|
||||
|
||||
# Check if port 80 is correctly configured
|
||||
if [ -n "$(bashio::addon.port "80")" ] && [ "$(bashio::addon.port "80")" != 80 ]; then
|
||||
if [ -n "$(bashio::app.port "80")" ] && [ "$(bashio::app.port "80")" != 80 ]; then
|
||||
bashio::log.fatal "The port 80 is enabled, but should still be 80 if you want automatic SSL certificates generation to work."
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -18,9 +18,9 @@ fi
|
||||
#################
|
||||
|
||||
# Variables
|
||||
ingress_port=$(bashio::addon.ingress_port)
|
||||
ingress_interface=$(bashio::addon.ip_address)
|
||||
ingress_entry=$(bashio::addon.ingress_entry)
|
||||
ingress_port=$(bashio::app.ingress_port)
|
||||
ingress_interface=$(bashio::app.ip_address)
|
||||
ingress_entry=$(bashio::app.ingress_entry)
|
||||
|
||||
# Quits if ingress is not active
|
||||
if [[ "$ingress_entry" != "/api"* ]]; then
|
||||
|
||||
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 1.8 KiB |
@@ -9,9 +9,9 @@ set -e
|
||||
declare ingress_interface
|
||||
declare ingress_port
|
||||
|
||||
ingress_port="$(bashio::addon.ingress_port)"
|
||||
ingress_interface="$(bashio::addon.ip_address)"
|
||||
ingress_entry="$(bashio::addon.ingress_entry)"
|
||||
ingress_port="$(bashio::app.ingress_port)"
|
||||
ingress_interface="$(bashio::app.ip_address)"
|
||||
ingress_entry="$(bashio::app.ingress_entry)"
|
||||
|
||||
sed -i \
|
||||
-e "s|proxy_pass http://api|proxy_pass http://127.0.0.1|g" \
|
||||
|
||||
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 1.2 KiB |
@@ -42,7 +42,7 @@ if bashio::config.has_value 'PASSWORD'; then
|
||||
PASSWORD=$(bashio::config 'PASSWORD')
|
||||
passwd -d abc
|
||||
echo -e "$PASSWORD\n$PASSWORD" | passwd abc
|
||||
elif ! bashio::config.has_value 'PASSWORD' && [[ -n "$(bashio::addon.port "3000")" ]] && [[ -n $(bashio::addon.port "3001") ]]; then
|
||||
elif ! bashio::config.has_value 'PASSWORD' && [[ -n "$(bashio::app.port "3000")" ]] && [[ -n $(bashio::app.port "3001") ]]; then
|
||||
bashio::log.warning "SEVERE RISK IDENTIFIED"
|
||||
bashio::log.warning "You are opening an external port but your password is not defined"
|
||||
bashio::log.warning "You risk being hacked ! Please disable the external ports, or use a password"
|
||||
|
||||
@@ -4,7 +4,7 @@ set -e
|
||||
|
||||
# nginx Path
|
||||
NGINX_CONFIG=/etc/nginx/sites-available/ingress.conf
|
||||
SUBFOLDER="$(bashio::addon.ingress_entry)/"
|
||||
SUBFOLDER="$(bashio::app.ingress_entry)/"
|
||||
|
||||
# Copy template
|
||||
cp /defaults/default.conf "${NGINX_CONFIG}"
|
||||
@@ -15,7 +15,7 @@ mv tmpfile "${NGINX_CONFIG}"
|
||||
# Remove ipv6
|
||||
sed -i '/listen \[::\]/d' "${NGINX_CONFIG}"
|
||||
# Add ingress parameters
|
||||
sed -i "s|3000|$(bashio::addon.ingress_port)|g" "${NGINX_CONFIG}"
|
||||
sed -i "s|3000|$(bashio::app.ingress_port)|g" "${NGINX_CONFIG}"
|
||||
sed -i "s|CWS|8082|g" "${NGINX_CONFIG}"
|
||||
sed -i '/proxy_buffering/a proxy_set_header Accept-Encoding "";' "${NGINX_CONFIG}"
|
||||
sed -i '/proxy_buffering/a sub_filter_once off;' "${NGINX_CONFIG}"
|
||||
|
||||
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 1.4 KiB |
@@ -3,7 +3,7 @@
|
||||
set -e
|
||||
|
||||
NGINX_CONFIG=/etc/nginx/sites-available/ingress.conf
|
||||
SUBFOLDER="$(bashio::addon.ingress_entry)"
|
||||
SUBFOLDER="$(bashio::app.ingress_entry)"
|
||||
|
||||
# Ensure subfolder ends with a trailing slash (except for root)
|
||||
if [[ -n "${SUBFOLDER}" && "${SUBFOLDER}" != "/" ]]; then
|
||||
@@ -22,7 +22,7 @@ mv tmpfile "${NGINX_CONFIG}"
|
||||
sed -i '/listen \[::\]/d' "${NGINX_CONFIG}"
|
||||
|
||||
# Adapt ports and upstream paths for Home Assistant ingress
|
||||
sed -i "s|3000|$(bashio::addon.ingress_port)|g" "${NGINX_CONFIG}"
|
||||
sed -i "s|3000|$(bashio::app.ingress_port)|g" "${NGINX_CONFIG}"
|
||||
sed -i "s|SUBFOLDER|/|g" "${NGINX_CONFIG}"
|
||||
sed -i "s|CWS|8082|g" "${NGINX_CONFIG}"
|
||||
sed -i "s|REPLACE_HOME|${HOME:-/root}|g" "${NGINX_CONFIG}"
|
||||
|
||||
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 1.6 KiB |
@@ -12,7 +12,7 @@ declare ingress_interface
|
||||
declare ingress_port
|
||||
#declare keyfile
|
||||
|
||||
#port=$(bashio::addon.port 80)
|
||||
#port=$(bashio::app.port 80)
|
||||
#if bashio::var.has_value "${port}"; then
|
||||
# bashio::config.require.ssl
|
||||
#
|
||||
@@ -45,12 +45,12 @@ if bashio::config.has_value 'ingress_user'; then
|
||||
ingress_user=$(bashio::config 'ingress_user')
|
||||
fi
|
||||
|
||||
ingress_port=$(bashio::addon.ingress_port)
|
||||
ingress_interface=$(bashio::addon.ip_address)
|
||||
ingress_port=$(bashio::app.ingress_port)
|
||||
ingress_interface=$(bashio::app.ip_address)
|
||||
#ha_port=$(bashio::core.port)
|
||||
|
||||
sed -i "s/%%ingress_user%%/${ingress_user}/g" /etc/nginx/servers/ingress.conf
|
||||
sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf
|
||||
#sed -i "s/%%haport%%/${ha_port}/g" /etc/nginx/servers/ingress.conf
|
||||
sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf
|
||||
sed -i "s|%%UIPATH%%|$(bashio::addon.ingress_entry)|g" /etc/nginx/servers/ingress.conf
|
||||
sed -i "s|%%UIPATH%%|$(bashio::app.ingress_entry)|g" /etc/nginx/servers/ingress.conf
|
||||
@@ -9,9 +9,9 @@ declare ingress_interface
|
||||
declare ingress_port
|
||||
declare ingress_entry
|
||||
|
||||
ingress_port=$(bashio::addon.ingress_port)
|
||||
ingress_interface=$(bashio::addon.ip_address)
|
||||
ingress_entry=$(bashio::addon.ingress_entry)
|
||||
ingress_port=$(bashio::app.ingress_port)
|
||||
ingress_interface=$(bashio::app.ip_address)
|
||||
ingress_entry=$(bashio::app.ingress_entry)
|
||||
|
||||
sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf
|
||||
sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf
|
||||
|
||||
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 1.4 KiB |
@@ -51,7 +51,7 @@ declare ingress_interface
|
||||
declare ingress_port
|
||||
# declare keyfile
|
||||
|
||||
CLOUDCMD_PREFIX=$(bashio::addon.ingress_entry)
|
||||
CLOUDCMD_PREFIX=$(bashio::app.ingress_entry)
|
||||
export CLOUDCMD_PREFIX
|
||||
|
||||
declare ADDON_PROTOCOL=http
|
||||
@@ -60,9 +60,9 @@ if bashio::config.true 'ssl'; then
|
||||
bashio::config.require.ssl
|
||||
fi
|
||||
|
||||
# port=$(bashio::addon.port 80)
|
||||
ingress_port=$(bashio::addon.ingress_port)
|
||||
ingress_interface=$(bashio::addon.ip_address)
|
||||
# port=$(bashio::app.port 80)
|
||||
ingress_port=$(bashio::app.ingress_port)
|
||||
ingress_interface=$(bashio::app.ip_address)
|
||||
sed -i "s|%%protocol%%|${ADDON_PROTOCOL}|g" /etc/nginx/servers/ingress.conf
|
||||
sed -i "s|%%port%%|${ingress_port}|g" /etc/nginx/servers/ingress.conf
|
||||
sed -i "s|%%interface%%|${ingress_interface}|g" /etc/nginx/servers/ingress.conf
|
||||
|
||||
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 1.4 KiB |
@@ -8,7 +8,7 @@ CSRF=""
|
||||
# Get HA Port
|
||||
result=$(bashio::api.supervisor GET /core/info true || true)
|
||||
port=$(bashio::jq "$result" ".data.port")
|
||||
addon_port=$(bashio::addon.port 9810)
|
||||
addon_port=$(bashio::app.port 9810)
|
||||
|
||||
# Get all possible URLs
|
||||
result=$(bashio::api.supervisor GET /core/api/config true || true)
|
||||
@@ -44,7 +44,7 @@ for url in "${urls[@]}"; do
|
||||
if bashio::var.has_value "${url}"; then
|
||||
if [[ "${url}" != "null" ]] && [[ "${url}" != "null.local" ]]; then
|
||||
CSRF="https://${url}:${port},http://${url}:${port},https://${url},http://${url}",${CSRF}
|
||||
if bashio::var.has_value "$(bashio::addon.port 9810)"; then
|
||||
if bashio::var.has_value "$(bashio::app.port 9810)"; then
|
||||
CSRF="https://${url}:${addon_port},http://${url}:${addon_port}",${CSRF}
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -26,7 +26,7 @@ declare ingress_interface
|
||||
declare ingress_port
|
||||
#declare keyfile
|
||||
|
||||
FB_BASEURL="$(bashio::addon.ingress_entry)"
|
||||
FB_BASEURL="$(bashio::app.ingress_entry)"
|
||||
export FB_BASEURL
|
||||
|
||||
declare ADDON_PROTOCOL=http
|
||||
@@ -35,9 +35,9 @@ if bashio::config.true 'ssl'; then
|
||||
ADDON_PROTOCOL=https
|
||||
fi
|
||||
|
||||
#port=$(bashio::addon.port 80)
|
||||
ingress_port=$(bashio::addon.ingress_port)
|
||||
ingress_interface=$(bashio::addon.ip_address)
|
||||
#port=$(bashio::app.port 80)
|
||||
ingress_port=$(bashio::app.ingress_port)
|
||||
ingress_interface=$(bashio::app.ip_address)
|
||||
sed -i "s|%%protocol%%|${ADDON_PROTOCOL}|g" /etc/nginx/servers/ingress.conf
|
||||
sed -i "s|%%port%%|${ingress_port}|g" /etc/nginx/servers/ingress.conf
|
||||
sed -i "s|%%interface%%|${ingress_interface}|g" /etc/nginx/servers/ingress.conf
|
||||
|
||||
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 1.4 KiB |
@@ -28,7 +28,7 @@ if [[ "$INGRESS" == "true" ]]; then
|
||||
declare ingress_port
|
||||
#declare keyfile
|
||||
|
||||
FB_BASEURL="$(bashio::addon.ingress_entry)"
|
||||
FB_BASEURL="$(bashio::app.ingress_entry)"
|
||||
export FB_BASEURL
|
||||
|
||||
declare ADDON_PROTOCOL=http
|
||||
@@ -37,9 +37,9 @@ if [[ "$INGRESS" == "true" ]]; then
|
||||
ADDON_PROTOCOL=https
|
||||
fi
|
||||
|
||||
#port=$(bashio::addon.port 80)
|
||||
ingress_port=$(bashio::addon.ingress_port)
|
||||
ingress_interface=$(bashio::addon.ip_address)
|
||||
#port=$(bashio::app.port 80)
|
||||
ingress_port=$(bashio::app.ingress_port)
|
||||
ingress_interface=$(bashio::app.ip_address)
|
||||
sed -i "s|%%protocol%%|${ADDON_PROTOCOL}|g" /etc/nginx/servers/ingress.conf
|
||||
sed -i "s|%%port%%|${ingress_port}|g" /etc/nginx/servers/ingress.conf
|
||||
sed -i "s|%%interface%%|${ingress_interface}|g" /etc/nginx/servers/ingress.conf
|
||||
|
||||
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 1.7 KiB |
@@ -10,8 +10,8 @@ declare ingress_interface
|
||||
declare ingress_port
|
||||
|
||||
echo "Adapting for ingress"
|
||||
ingress_port=$(bashio::addon.ingress_port)
|
||||
ingress_interface=$(bashio::addon.ip_address)
|
||||
ingress_port=$(bashio::app.ingress_port)
|
||||
ingress_interface=$(bashio::app.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
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 1.3 KiB |
@@ -10,8 +10,8 @@ declare ingress_interface
|
||||
declare ingress_port
|
||||
|
||||
echo "Adapting for ingress"
|
||||
ingress_port=$(bashio::addon.ingress_port)
|
||||
ingress_interface=$(bashio::addon.ip_address)
|
||||
ingress_port=$(bashio::app.ingress_port)
|
||||
ingress_interface=$(bashio::app.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
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 1.3 KiB |
@@ -8,9 +8,9 @@ set -e
|
||||
declare ingress_interface
|
||||
declare ingress_port
|
||||
|
||||
ingress_port=$(bashio::addon.ingress_port)
|
||||
ingress_interface=$(bashio::addon.ip_address)
|
||||
ingress_entry=$(bashio::addon.ingress_entry)
|
||||
ingress_port=$(bashio::app.ingress_port)
|
||||
ingress_interface=$(bashio::app.ip_address)
|
||||
ingress_entry=$(bashio::app.ingress_entry)
|
||||
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|%%ingress_entry%%|${ingress_entry}|g" /etc/nginx/servers/ingress.conf
|
||||
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 1.6 KiB |
@@ -8,9 +8,9 @@ set -e
|
||||
declare ingress_interface
|
||||
declare ingress_port
|
||||
|
||||
ingress_port=$(bashio::addon.ingress_port)
|
||||
ingress_interface=$(bashio::addon.ip_address)
|
||||
ingress_entry=$(bashio::addon.ingress_entry)
|
||||
ingress_port=$(bashio::app.ingress_port)
|
||||
ingress_interface=$(bashio::app.ip_address)
|
||||
ingress_entry=$(bashio::app.ingress_entry)
|
||||
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|%%ingress_entry%%|${ingress_entry}|g" /etc/nginx/servers/ingress.conf
|
||||
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 1.6 KiB |
@@ -42,7 +42,7 @@ declare ingress_interface
|
||||
declare ingress_port
|
||||
#declare keyfile
|
||||
|
||||
FB_BASE_URL=$(bashio::addon.ingress_entry)
|
||||
FB_BASE_URL=$(bashio::app.ingress_entry)
|
||||
export FB_BASE_URL
|
||||
|
||||
declare ADDON_PROTOCOL=http
|
||||
@@ -51,9 +51,9 @@ if bashio::config.true 'ssl'; then
|
||||
ADDON_PROTOCOL=https
|
||||
fi
|
||||
|
||||
#port=$(bashio::addon.port 80)
|
||||
ingress_port=$(bashio::addon.ingress_port)
|
||||
ingress_interface=$(bashio::addon.ip_address)
|
||||
#port=$(bashio::app.port 80)
|
||||
ingress_port=$(bashio::app.ingress_port)
|
||||
ingress_interface=$(bashio::app.ip_address)
|
||||
sed -i "s|%%protocol%%|${ADDON_PROTOCOL}|g" /etc/nginx/servers/ingress.conf
|
||||
sed -i "s|%%port%%|${ingress_port}|g" /etc/nginx/servers/ingress.conf
|
||||
sed -i "s|%%interface%%|${ingress_interface}|g" /etc/nginx/servers/ingress.conf
|
||||
|
||||
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 1.6 KiB |
@@ -43,7 +43,7 @@ declare ingress_interface
|
||||
declare ingress_port
|
||||
#declare keyfile
|
||||
|
||||
FB_BASEURL=$(bashio::addon.ingress_entry)
|
||||
FB_BASEURL=$(bashio::app.ingress_entry)
|
||||
export FB_BASEURL
|
||||
|
||||
declare ADDON_PROTOCOL=http
|
||||
@@ -52,9 +52,9 @@ if bashio::config.true 'ssl'; then
|
||||
ADDON_PROTOCOL=https
|
||||
fi
|
||||
|
||||
#port=$(bashio::addon.port 80)
|
||||
ingress_port=$(bashio::addon.ingress_port)
|
||||
ingress_interface=$(bashio::addon.ip_address)
|
||||
#port=$(bashio::app.port 80)
|
||||
ingress_port=$(bashio::app.ingress_port)
|
||||
ingress_interface=$(bashio::app.ip_address)
|
||||
sed -i "s|%%protocol%%|${ADDON_PROTOCOL}|g" /etc/nginx/servers/ingress.conf
|
||||
sed -i "s|%%port%%|${ingress_port}|g" /etc/nginx/servers/ingress.conf
|
||||
sed -i "s|%%interface%%|${ingress_interface}|g" /etc/nginx/servers/ingress.conf
|
||||
|
||||
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 1.5 KiB |
@@ -6,8 +6,8 @@ slug=fireflyiii_data_importer
|
||||
|
||||
if [[ "$(bashio::config "CONFIG_LOCATION")" == *"/addons_config/fireflyiii_data_importer"* ]]; then
|
||||
bashio::log.warning "Reset CONFIG_LOCATION to /config"
|
||||
bashio::addon.option "CONFIG_LOCATION" "/config"
|
||||
bashio::addon.restart
|
||||
bashio::app.option "CONFIG_LOCATION" "/config"
|
||||
bashio::app.restart
|
||||
fi
|
||||
|
||||
CONFIGSOURCE="$(bashio::config "CONFIG_LOCATION")"
|
||||
|
||||
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 1.3 KiB |
@@ -82,4 +82,4 @@ done
|
||||
|
||||
bashio::log.info "All actions concluded. Stopping in 10 seconds."
|
||||
sleep 10
|
||||
bashio::addon.stop
|
||||
bashio::app.stop
|
||||
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 1.5 KiB |
@@ -38,7 +38,7 @@ for file in /data/gitea/conf/app.ini /etc/templates/app.ini; do
|
||||
if bashio::config.has_value 'ROOT_URL'; then
|
||||
bashio::log.blue "ROOT_URL set, using value : $(bashio::config 'ROOT_URL')"
|
||||
else
|
||||
ROOT_URL="$PROTOCOL://$(bashio::config 'DOMAIN'):$(bashio::addon.port 3000)"
|
||||
ROOT_URL="$PROTOCOL://$(bashio::config 'DOMAIN'):$(bashio::app.port 3000)"
|
||||
bashio::log.blue "ROOT_URL not set, using extrapolated value : $ROOT_URL"
|
||||
sed -i "/server/a ROOT_URL=$ROOT_URL" "$file"
|
||||
fi
|
||||
|
||||
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 1.3 KiB |
@@ -12,7 +12,7 @@ declare keyfile
|
||||
# General values
|
||||
port=5001
|
||||
sed -i "s|%%port%%|$port|g" /etc/nginx/servers/ssl.conf
|
||||
sed -i "s|%%interface%%|$(bashio::addon.ip_address)|g" /etc/nginx/servers/ssl.conf
|
||||
sed -i "s|%%interface%%|$(bashio::app.ip_address)|g" /etc/nginx/servers/ssl.conf
|
||||
|
||||
# Ssl values
|
||||
if bashio::config.true 'ssl'; then
|
||||
@@ -29,5 +29,5 @@ if bashio::config.true 'ssl'; then
|
||||
sed -i "s|default_server|ssl|g" /etc/nginx/servers/ssl.conf
|
||||
sed -i "/proxy_params.conf/a ssl_certificate /ssl/$certfile;" /etc/nginx/servers/ssl.conf
|
||||
sed -i "/proxy_params.conf/a ssl_certificate_key /ssl/$keyfile;" /etc/nginx/servers/ssl.conf
|
||||
bashio::log.info "Ssl enabled, please use https for connection. UI is at https://YOURIP:$(bashio::addon.port "$port")"
|
||||
bashio::log.info "Ssl enabled, please use https for connection. UI is at https://YOURIP:$(bashio::app.port "$port")"
|
||||
fi
|
||||
@@ -44,7 +44,7 @@ else
|
||||
bashio::log.warning "Secret key saved to addon options."
|
||||
GRAMPSWEB_SECRET_KEY="$(cat /config/secret/secret)"
|
||||
export GRAMPSWEB_SECRET_KEY
|
||||
bashio::addon.option "GRAMPSWEB_SECRET_KEY" "$GRAMPSWEB_SECRET_KEY"
|
||||
bashio::app.option "GRAMPSWEB_SECRET_KEY" "$GRAMPSWEB_SECRET_KEY"
|
||||
fi
|
||||
|
||||
##################
|
||||
|
||||
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 1.6 KiB |
@@ -11,7 +11,7 @@ declare ingress_interface
|
||||
declare ingress_port
|
||||
declare keyfile
|
||||
|
||||
port=$(bashio::addon.port 80)
|
||||
port=$(bashio::app.port 80)
|
||||
if bashio::var.has_value "${port}"; then
|
||||
bashio::config.require.ssl
|
||||
|
||||
@@ -28,12 +28,12 @@ if bashio::var.has_value "${port}"; then
|
||||
fi
|
||||
fi
|
||||
|
||||
ingress_port=$(bashio::addon.ingress_port)
|
||||
ingress_interface=$(bashio::addon.ip_address)
|
||||
ingress_port=$(bashio::app.ingress_port)
|
||||
ingress_interface=$(bashio::app.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
|
||||
|
||||
# Implement SUBFOLDER value
|
||||
if [ -f /etc/s6-overlay/s6-rc.d/svc-autostart/run ]; then sed -i "1a SUBFOLDER=$(bashio::addon.ingress_url)" /etc/s6-overlay/s6-rc.d/svc-autostart/run; fi
|
||||
if [ -f /etc/services.d/guacamole/run ]; then sed -i "2a SUBFOLDER=$(bashio::addon.ingress_url)" /etc/services.d/guacamole/run; fi
|
||||
if [ -f /etc/services.d/guacd/run ]; then sed -i "2a SUBFOLDER=$(bashio::addon.ingress_url)" /etc/services.d/guacd/run; fi
|
||||
if [ -f /etc/s6-overlay/s6-rc.d/svc-autostart/run ]; then sed -i "1a SUBFOLDER=$(bashio::app.ingress_url)" /etc/s6-overlay/s6-rc.d/svc-autostart/run; fi
|
||||
if [ -f /etc/services.d/guacamole/run ]; then sed -i "2a SUBFOLDER=$(bashio::app.ingress_url)" /etc/services.d/guacamole/run; fi
|
||||
if [ -f /etc/services.d/guacd/run ]; then sed -i "2a SUBFOLDER=$(bashio::app.ingress_url)" /etc/services.d/guacd/run; fi
|
||||
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 1.6 KiB |
@@ -39,7 +39,7 @@ check_db_hostname() {
|
||||
bashio::log.warning "The addon will stop until this is fixed."
|
||||
bashio::log.warning "------------------------------------"
|
||||
sleep 30
|
||||
bashio::addon.stop
|
||||
bashio::app.stop
|
||||
else
|
||||
echo "$DB_HOSTNAME is reachable."
|
||||
fi
|
||||
@@ -89,7 +89,7 @@ setup_root_user() {
|
||||
else
|
||||
bashio::log.warning "DB_ROOT_PASSWORD not set. Generating a random 12-character alphanumeric password and storing it in the addon options."
|
||||
export DB_ROOT_PASSWORD="$(tr -dc 'A-Za-z0-9' < /dev/urandom | head -c12)"
|
||||
bashio::addon.option "DB_ROOT_PASSWORD" "${DB_ROOT_PASSWORD}"
|
||||
bashio::app.option "DB_ROOT_PASSWORD" "${DB_ROOT_PASSWORD}"
|
||||
|
||||
# Store generated password in the s6 environment if available
|
||||
if [ -d /var/run/s6/container_environment ]; then
|
||||
|
||||
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 1.3 KiB |
@@ -11,7 +11,7 @@ declare ingress_interface
|
||||
declare ingress_port
|
||||
declare keyfile
|
||||
|
||||
port=$(bashio::addon.port 80)
|
||||
port=$(bashio::app.port 80)
|
||||
if bashio::var.has_value "${port}"; then
|
||||
bashio::config.require.ssl
|
||||
|
||||
@@ -28,8 +28,8 @@ if bashio::var.has_value "${port}"; then
|
||||
fi
|
||||
fi
|
||||
|
||||
ingress_port=$(bashio::addon.ingress_port)
|
||||
ingress_interface=$(bashio::addon.ip_address)
|
||||
ingress_port=$(bashio::app.ingress_port)
|
||||
ingress_interface=$(bashio::app.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
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 1.3 KiB |
@@ -63,16 +63,16 @@ declare ingress_interface
|
||||
declare ingress_port
|
||||
#declare keyfile
|
||||
|
||||
#INGRESSURL=$(bashio::config 'local_ip_port')$(bashio::addon.ingress_url)
|
||||
#INGRESSURL=$(bashio::config 'local_ip_port')$(bashio::app.ingress_url)
|
||||
host_port=$(bashio::core.port)
|
||||
ingress_url=$(bashio::addon.ingress_entry)
|
||||
ADDONPORT=$(bashio::addon.port "8081")
|
||||
ingress_url=$(bashio::app.ingress_entry)
|
||||
ADDONPORT=$(bashio::app.port "8081")
|
||||
host_ip=$(bashio::network.ipv4_address)
|
||||
host_ip=${host_ip%/*}
|
||||
UIPATH=$(bashio::config 'ui_path')
|
||||
#port=$(bashio::addon.port 80)
|
||||
ingress_port=$(bashio::addon.ingress_port)
|
||||
ingress_interface=$(bashio::addon.ip_address)
|
||||
#port=$(bashio::app.port 80)
|
||||
ingress_port=$(bashio::app.ingress_port)
|
||||
ingress_interface=$(bashio::app.ip_address)
|
||||
|
||||
#################
|
||||
# NGINX SETTING #
|
||||
|
||||
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 1.4 KiB |