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

Added Ingress autologin

Browse Source 
Cleanup of previous tests remains
This commit is contained in:
Marco Lusini
2022-06-09 18:51:03 +02:00
parent 1b9f053e82
commit 4ffc0d5689
6 changed files with 52 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
calibre_web/rootfs/etc/cont-init.d/32-nginx.sh
View File

@@ -4,45 +4,52 @@
#################
# NGINX SETTING #
#################
declare port
declare certfile
#declare port
#declare certfile
declare ingress_user
declare ingress_interface
declare ingress_port
declare keyfile
#declare keyfile
port=$(bashio::addon.port 80)
if bashio::var.has_value "${port}"; then
bashio::config.require.ssl
#port=$(bashio::addon.port 80)
#if bashio::var.has_value "${port}"; then
# bashio::config.require.ssl
#
# if bashio::config.true 'ssl'; then
# certfile=$(bashio::config 'certfile')
# keyfile=$(bashio::config 'keyfile')
#
# mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf
# sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/servers/direct.conf
# sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/servers/direct.conf
#
# else
# mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf
# fi
#fi
if bashio::config.true 'ssl'; then
certfile=$(bashio::config 'certfile')
keyfile=$(bashio::config 'keyfile')
## Force scheme
#if bashio::config.true 'force_scheme_https'; then
# # shellcheck disable=SC2016
# sed -i 's|$scheme|https|g' /etc/nginx/servers/ingress.conf
#fi
mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf
sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/servers/direct.conf
sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/servers/direct.conf
## Force external port
#if bashio::config.has_value 'force_external_port'; then
# sed -i "s|%%haport%%|$(bashio::config 'force_external_port')|g" /etc/nginx/servers/ingress.conf
#fi
else
mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf
fi
fi
# Force scheme
if bashio::config.true 'force_scheme_https'; then
# shellcheck disable=SC2016
sed -i 's|$scheme|https|g' /etc/nginx/servers/ingress.conf
fi
# Force external port
if bashio::config.has_value 'force_external_port'; then
sed -i "s|%%haport%%|$(bashio::config 'force_external_port')|g" /etc/nginx/servers/ingress.conf
ingress_user='admin'
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)
ha_port=$(bashio::core.port)
#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/%%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

6
calibre_web/rootfs/etc/cont-init.d/80-configuration.sh
View File

@@ -9,9 +9,7 @@ if bashio::config.has_value 'TZ'; then
ln -snf /usr/share/zoneinfo/"$TIMEZONE" /etc/localtime && echo "$TIMEZONE" >/etc/timezone
fi
# Disable session protection
# https://forums.unraid.net/topic/71927-support-linuxserverio-calibre-web/page/5/#comment-1015352
#echo "**** patching calibre-web - removing session protection ****"
#sed -i "/lm.session_protection = 'strong'/d" /app/calibre-web/cps/__init__.py || true
# Set Ingress login
sqlite3 /config/addons_config/calibre-web/app.db 'update settings set config_reverse_proxy_login_header_name="X-WebAuth-User",config_allow_reverse_proxy_header_login=1'
bashio::log.info "Default username:password is admin:admin123"