diff --git a/autobrr/config.json b/autobrr/config.json index c2bf8a347..3a21caaa4 100644 --- a/autobrr/config.json +++ b/autobrr/config.json @@ -48,7 +48,6 @@ "BASE_DOCKER_DATA_PATH": "/data/autobrr" }, "image": "ghcr.io/alexbelgium/autobrr-{arch}", - "ingress": true, "ingress_entry": "hassioautobrr", "init": false, "map": [ @@ -86,5 +85,5 @@ }, "slug": "autobrr", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/autobrr", - "version": "1.9.0" -} + "version": "v1.9.0" +} \ No newline at end of file diff --git a/autobrr/rootfs/etc/cont-init.d/91-run.sh b/autobrr/rootfs/etc/cont-init.d/91-run.sh index 185d9e5e2..6b52788d6 100755 --- a/autobrr/rootfs/etc/cont-init.d/91-run.sh +++ b/autobrr/rootfs/etc/cont-init.d/91-run.sh @@ -6,15 +6,15 @@ ############### # Set UrlBase -if ! grep -q "hassioautobrr" /config/addons_config/autobrr/config.toml; then - bashio::log.warning "BaseUrl not set properly, restarting" - sed -i "/baseUrl/d" /config/addons_config/autobrr/config.toml - sed -i "/# Base url/a baseUrl = \"\/hassioautobrr\/\"" /config/addons_config/autobrr/config.toml - bashio::addon.restart -fi +#if ! grep -q "hassioautobrr" /config/addons_config/autobrr/config.toml; then +# bashio::log.warning "BaseUrl not set properly, restarting" +# sed -i "/baseUrl/d" /config/addons_config/autobrr/config.toml +# sed -i "/# Base url/a baseUrl = \"\/hassioautobrr\/\"" /config/addons_config/autobrr/config.toml +# bashio::addon.restart +#fi -bashio::log.info "Starting NGinx..." -nginx & true +#bashio::log.info "Starting NGinx..." +#nginx & true ############# # Start app # diff --git a/autobrr/rootfs/etc/services.d/nginx/finish b/autobrr/rootfs/etc/services.d/nginx/finish deleted file mode 100644 index 444240135..000000000 --- a/autobrr/rootfs/etc/services.d/nginx/finish +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/execlineb -S0 -# ============================================================================== -# Take down the S6 supervision tree when Nginx fails -# ============================================================================== -if { s6-test ${1} -ne 0 } -if { s6-test ${1} -ne 256 } - -s6-svscanctl -t /var/run/s6/services diff --git a/autobrr/rootfs/etc/services.d/nginx/run b/autobrr/rootfs/etc/services.d/nginx/run deleted file mode 100644 index 033a36a65..000000000 --- a/autobrr/rootfs/etc/services.d/nginx/run +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/with-contenv bashio -# shellcheck shell=bash -# ============================================================================== - -# Set variables -slug=autobrr -port=7474 -CONFIG_LOCATION=/config/addons_config/"$slug"/config.toml - -# Wait for transmission to become available -bashio::net.wait_for "$port" localhost 900 - -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.toml -fi - -# Set UrlBase -if ! grep -q "/hassioautobrr" "$CONFIG_LOCATION" && ! bashio::config.true "ingress_disabled"; then - bashio::log.warning "BaseUrl not set properly, restarting" - sed -i "/baseUrl/d" "$CONFIG_LOCATION" - sed -i "/# Base url/a baseUrl = \"/hassioautobrr/\"" "$CONFIG_LOCATION" - bashio::addon.restart -fi - -bashio::log.info "Starting NGinx..." -exec nginx