From 0ac9b5136b818aec24b3a29f6b1f9577601e9779 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 19 Feb 2026 09:20:55 +0000 Subject: [PATCH 2/3] Fix ingress implementation with proper s6 services Co-authored-by: alexbelgium <44178713+alexbelgium@users.noreply.github.com> --- seerr/rootfs/etc/cont-init.d/99-run.sh | 14 ++++++-------- seerr/rootfs/etc/nginx/servers/ingress.conf | 19 +++++++++++-------- seerr/rootfs/etc/services.d/nginx/finish | 8 ++++++++ seerr/rootfs/etc/services.d/nginx/run | 14 ++++++++++++++ seerr/rootfs/etc/services.d/seerr/finish | 8 ++++++++ seerr/rootfs/etc/services.d/seerr/run | 8 ++++++++ 6 files changed, 55 insertions(+), 16 deletions(-) create mode 100755 seerr/rootfs/etc/services.d/nginx/finish create mode 100755 seerr/rootfs/etc/services.d/nginx/run create mode 100755 seerr/rootfs/etc/services.d/seerr/finish create mode 100755 seerr/rootfs/etc/services.d/seerr/run diff --git a/seerr/rootfs/etc/cont-init.d/99-run.sh b/seerr/rootfs/etc/cont-init.d/99-run.sh index 4d3ef367d..e1f19acbb 100755 --- a/seerr/rootfs/etc/cont-init.d/99-run.sh +++ b/seerr/rootfs/etc/cont-init.d/99-run.sh @@ -2,15 +2,13 @@ # shellcheck shell=bash set -e -rm -r /app/config +# Setup config directory +if [ -d /app/config ]; then + rm -r /app/config +fi ln -sf /config /app/config +# Set permissions chown -R "$PUID:$PGID" /config || true -cd /app || true - -bashio::log.info "Starting NGinx..." -nginx & - -bashio::log.info "Starting app" -exec npm start +bashio::log.info "Seerr initialization complete" diff --git a/seerr/rootfs/etc/nginx/servers/ingress.conf b/seerr/rootfs/etc/nginx/servers/ingress.conf index 39fcaa850..c430875ea 100644 --- a/seerr/rootfs/etc/nginx/servers/ingress.conf +++ b/seerr/rootfs/etc/nginx/servers/ingress.conf @@ -1,9 +1,6 @@ server { listen %%interface%%:%%port%% default_server; - #include /etc/nginx/includes/server_params.conf; - #include /etc/nginx/includes/proxy_params.conf; - client_max_body_size 0; location / { @@ -11,20 +8,26 @@ server { proxy_connect_timeout 30m; proxy_send_timeout 30m; proxy_read_timeout 30m; - proxy_pass http://0.0.0.0:5055; + proxy_pass http://127.0.0.1:5055; - # Allow signalr + # WebSocket support for real-time updates proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $http_connection; + proxy_set_header Connection $connection_upgrade; + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Host $http_host; - # Correct base_url + # Correct base_url - rewrite absolute root paths to ingress entry proxy_set_header Accept-Encoding ""; sub_filter_once off; sub_filter_types *; sub_filter 'href="/"' 'href="%%ingress_entry%%/"'; + sub_filter 'src="/"' 'src="%%ingress_entry%%/"'; sub_filter '"\/"' '"%%ingress_entry2%%\/"'; - } + sub_filter 'action="/' 'action="%%ingress_entry%%/'; + } } diff --git a/seerr/rootfs/etc/services.d/nginx/finish b/seerr/rootfs/etc/services.d/nginx/finish new file mode 100755 index 000000000..49f969d63 --- /dev/null +++ b/seerr/rootfs/etc/services.d/nginx/finish @@ -0,0 +1,8 @@ +#!/usr/bin/execlineb -S0 +# ============================================================================== +# Take down the S6 supervision tree when Nginx fails +# ============================================================================== +if { test ${1} -ne 0 } +if { test ${1} -ne 256 } + +s6-svscanctl -t /var/run/s6/services diff --git a/seerr/rootfs/etc/services.d/nginx/run b/seerr/rootfs/etc/services.d/nginx/run new file mode 100755 index 000000000..84a4fce13 --- /dev/null +++ b/seerr/rootfs/etc/services.d/nginx/run @@ -0,0 +1,14 @@ +#!/usr/bin/with-contenv bashio +# shellcheck shell=bash +set -e +# ============================================================================== + +# Set variables +slug=seerr +port=5055 + +# Wait for seerr to become available +bashio::net.wait_for "$port" localhost 900 + +bashio::log.info "Starting NGinx..." +exec nginx diff --git a/seerr/rootfs/etc/services.d/seerr/finish b/seerr/rootfs/etc/services.d/seerr/finish new file mode 100755 index 000000000..90d6990f4 --- /dev/null +++ b/seerr/rootfs/etc/services.d/seerr/finish @@ -0,0 +1,8 @@ +#!/usr/bin/execlineb -S0 +# ============================================================================== +# Take down the S6 supervision tree when Seerr fails +# ============================================================================== +if { test ${1} -ne 0 } +if { test ${1} -ne 256 } + +s6-svscanctl -t /var/run/s6/services diff --git a/seerr/rootfs/etc/services.d/seerr/run b/seerr/rootfs/etc/services.d/seerr/run new file mode 100755 index 000000000..0e5c17344 --- /dev/null +++ b/seerr/rootfs/etc/services.d/seerr/run @@ -0,0 +1,8 @@ +#!/usr/bin/with-contenv bashio +# shellcheck shell=bash +set -e + +cd /app || exit 1 + +bashio::log.info "Starting Seerr..." +exec npm start From 2fccdf492373322124b87a0eab46cfd4948d6c4f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 19 Feb 2026 09:21:35 +0000 Subject: [PATCH 3/3] Fix NGINX spelling and action attribute sub_filter quotes Co-authored-by: alexbelgium <44178713+alexbelgium@users.noreply.github.com> --- seerr/rootfs/etc/nginx/servers/ingress.conf | 2 +- seerr/rootfs/etc/services.d/nginx/run | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/seerr/rootfs/etc/nginx/servers/ingress.conf b/seerr/rootfs/etc/nginx/servers/ingress.conf index c430875ea..38e11a251 100644 --- a/seerr/rootfs/etc/nginx/servers/ingress.conf +++ b/seerr/rootfs/etc/nginx/servers/ingress.conf @@ -27,7 +27,7 @@ server { sub_filter 'href="/"' 'href="%%ingress_entry%%/"'; sub_filter 'src="/"' 'src="%%ingress_entry%%/"'; sub_filter '"\/"' '"%%ingress_entry2%%\/"'; - sub_filter 'action="/' 'action="%%ingress_entry%%/'; + sub_filter 'action="/"' 'action="%%ingress_entry%%/"'; } } diff --git a/seerr/rootfs/etc/services.d/nginx/run b/seerr/rootfs/etc/services.d/nginx/run index 84a4fce13..9f8a9e4a9 100755 --- a/seerr/rootfs/etc/services.d/nginx/run +++ b/seerr/rootfs/etc/services.d/nginx/run @@ -10,5 +10,5 @@ port=5055 # Wait for seerr to become available bashio::net.wait_for "$port" localhost 900 -bashio::log.info "Starting NGinx..." +bashio::log.info "Starting NGINX..." exec nginx