From c0965df8ac786b0618c41c6d1b5da6c018e1361a Mon Sep 17 00:00:00 2001 From: Alexandre Date: Sat, 4 Feb 2023 18:14:30 +0100 Subject: [PATCH] removed ingress --- sabnzbd/config.json | 2 -- sabnzbd/rootfs/etc/cont-init.d/32-nginx_ingress.sh | 2 ++ sabnzbd/rootfs/etc/services.d/nginx/finish | 8 -------- sabnzbd/rootfs/etc/services.d/nginx/run | 10 ---------- 4 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 sabnzbd/rootfs/etc/services.d/nginx/finish delete mode 100644 sabnzbd/rootfs/etc/services.d/nginx/run diff --git a/sabnzbd/config.json b/sabnzbd/config.json index 4399131aa..e76cefa7e 100644 --- a/sabnzbd/config.json +++ b/sabnzbd/config.json @@ -47,8 +47,6 @@ }, "image": "ghcr.io/alexbelgium/sabnzbd-{arch}", "init": false, - "init": false, - "ingress": true, "ingress_entry": "sabnzbd", "map": [ "config:rw", diff --git a/sabnzbd/rootfs/etc/cont-init.d/32-nginx_ingress.sh b/sabnzbd/rootfs/etc/cont-init.d/32-nginx_ingress.sh index d28f24cf8..5b614d07d 100644 --- a/sabnzbd/rootfs/etc/cont-init.d/32-nginx_ingress.sh +++ b/sabnzbd/rootfs/etc/cont-init.d/32-nginx_ingress.sh @@ -5,6 +5,8 @@ # NGINX SETTING # ################# +exit 0 + ingress_port=$(bashio::addon.ingress_port) ingress_interface=$(bashio::addon.ip_address) sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf diff --git a/sabnzbd/rootfs/etc/services.d/nginx/finish b/sabnzbd/rootfs/etc/services.d/nginx/finish deleted file mode 100644 index 444240135..000000000 --- a/sabnzbd/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/sabnzbd/rootfs/etc/services.d/nginx/run b/sabnzbd/rootfs/etc/services.d/nginx/run deleted file mode 100644 index 07447d8b8..000000000 --- a/sabnzbd/rootfs/etc/services.d/nginx/run +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/with-contenv bashio -# shellcheck shell=bash -# ============================================================================== - -# Wait for transmission to become available -bashio::net.wait_for 8080 localhost 900 - -bashio::log.info "Starting NGinx..." - -exec nginx