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

Try to allow disabling ingress

Browse Source
This commit is contained in:
Alexandre
2023-02-06 20:12:18 +01:00
parent e7120a387b
commit 0e54bec144
4 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
radarr/config.json
View File

@@ -83,5 +83,5 @@
}, },
"slug": "radarr_nas", "slug": "radarr_nas",
"url": "https://github.com/alexbelgium/hassio-addons/tree/master/radarr", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/radarr",
"version": "4.3.2.6857-9" "version": "4.3.2.6857-10"
} }

25
radarr/rootfs/etc/cont-init.d/50-disable_ingress.sh
View File

@@ -1,25 +0,0 @@
#!/usr/bin/env bashio
# shellcheck shell=bash
###################
# Disable Ingress #
###################
if bashio::config.true "ingress_disabled"; then
bashio::log.warning "Ingress is disabled. You'll need to connect using ip:port"
rm /etc/nginx/servers/ingress.conf
rm -r /etc/services.d/nginx
# Set base url
CONFIG_LOCATION=/config/addons_config/radarr/config.xml
if bashio::config.has_value 'CONFIG_LOCATION'; then
CONFIG_LOCATION="$(bashio::config 'CONFIG_LOCATION')"
# Modify if it is a base directory
if [[ "$CONFIG_LOCATION" == *.* ]]; then CONFIG_LOCATION="$(dirname $CONFIG_LOCATION)"; fi
CONFIG_LOCATION="$CONFIG_LOCATION"/config.xml
if grep -q "UrlBase" "$CONFIG_LOCATION" || true; then
bashio::log.warning "BaseUrl removed, restarting"
sed -i "/UrlBase/d" "$CONFIG_LOCATION"
bashio::addon.restart
fi
fi
fi

12
radarr/rootfs/etc/index.html Normal file
View File

@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html>
<head>
<title>Ingress is disabled!</title>
</head>
<body>
<p>
Ingress was disabled by the user. Please connect using ip:port or
re-enable in the addons options.
</p>
</body>
</html>

22
radarr/rootfs/etc/services.d/nginx/run
View File

@@ -5,7 +5,7 @@
# Wait for transmission to become available # Wait for transmission to become available
bashio::net.wait_for 7878 localhost 900 bashio::net.wait_for 7878 localhost 900
# Set base url # Set Config location
CONFIG_LOCATION=/config/addons_config/radarr/config.xml CONFIG_LOCATION=/config/addons_config/radarr/config.xml
if bashio::config.has_value 'CONFIG_LOCATION'; then if bashio::config.has_value 'CONFIG_LOCATION'; then
CONFIG_LOCATION="$(bashio::config 'CONFIG_LOCATION')" CONFIG_LOCATION="$(bashio::config 'CONFIG_LOCATION')"
@@ -14,12 +14,30 @@ if bashio::config.has_value 'CONFIG_LOCATION'; then
CONFIG_LOCATION="$CONFIG_LOCATION"/config.xml CONFIG_LOCATION="$CONFIG_LOCATION"/config.xml
fi fi
if ! grep -q "<UrlBase>/radarr</UrlBase>" "$CONFIG_LOCATION"; then # Set UrlBase
if ! grep -q "<UrlBase>/radarr</UrlBase>" "$CONFIG_LOCATION" && ! bashio::config.true "ingress_disabled"; then
bashio::log.warning "BaseUrl not set properly, restarting" bashio::log.warning "BaseUrl not set properly, restarting"
sed -i "/UrlBase/d" "$CONFIG_LOCATION" sed -i "/UrlBase/d" "$CONFIG_LOCATION"
sed -i "/<Config>/a <UrlBase>\/radarr<\/UrlBase>" "$CONFIG_LOCATION" sed -i "/<Config>/a <UrlBase>\/radarr<\/UrlBase>" "$CONFIG_LOCATION"
bashio::addon.restart bashio::addon.restart
fi fi
# Disable Ingress
if bashio::config.true "ingress_disabled"; then
bashio::log.warning "Ingress is disabled. You'll need to connect using ip:port"
# Adapt ingress.conf
sed -i "proxy_pass/i root /etc;" /etc/nginx/servers/ingress.conf
sed -i "proxy_pass/i root /index.html;" /etc/nginx/servers/ingress.conf
sed -i "/proxy_pass/" /etc/nginx/servers/ingress.conf
# Remove BaseUrl
if grep -q "UrlBase" "$CONFIG_LOCATION" || true; then
bashio::log.warning "BaseUrl removed, restarting"
sed -i "/UrlBase/d" "$CONFIG_LOCATION"
bashio::addon.restart
fi
fi
bashio::log.info "Starting NGinx..." bashio::log.info "Starting NGinx..."
exec nginx exec nginx