From 5e2d024d13df972c1bde3cb30300abbadb6f9314 Mon Sep 17 00:00:00 2001 From: Matthias Wirth Date: Wed, 1 May 2024 19:54:30 +0200 Subject: [PATCH] run nginx when at least 1 server is defined to make TAR1090_DISABLE work together with serving prometheus on 9274 using nginx in ultrafeeder run only 1 nginx worker, more should never be needed --- rootfs/etc/nginx.tar1090/nginx.conf | 2 +- rootfs/etc/s6-overlay/scripts/nginx | 3 ++- rootfs/etc/s6-overlay/startup.d/04-tar1090-configure | 7 +++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/rootfs/etc/nginx.tar1090/nginx.conf b/rootfs/etc/nginx.tar1090/nginx.conf index 5ee4957..5ed99da 100644 --- a/rootfs/etc/nginx.tar1090/nginx.conf +++ b/rootfs/etc/nginx.tar1090/nginx.conf @@ -1,5 +1,5 @@ user www-data; -worker_processes auto; +worker_processes 1; pid /run/nginx.pid; include /etc/nginx/modules-enabled/*.conf; daemon off; diff --git a/rootfs/etc/s6-overlay/scripts/nginx b/rootfs/etc/s6-overlay/scripts/nginx index 9022445..d18b97d 100755 --- a/rootfs/etc/s6-overlay/scripts/nginx +++ b/rootfs/etc/s6-overlay/scripts/nginx @@ -3,10 +3,11 @@ source /scripts/common -if chk_enabled "${TAR1090_DISABLE}"; then +if [[ "$(ls /etc/nginx/sites-enabled | wc -l)" == "0" ]]; then exec sleep infinity fi + mkdir -p /var/log/nginx exec s6wrap --quiet --prepend=nginx --timestamps --args /usr/sbin/nginx diff --git a/rootfs/etc/s6-overlay/startup.d/04-tar1090-configure b/rootfs/etc/s6-overlay/startup.d/04-tar1090-configure index 7fdfae2..9c67c0b 100755 --- a/rootfs/etc/s6-overlay/startup.d/04-tar1090-configure +++ b/rootfs/etc/s6-overlay/startup.d/04-tar1090-configure @@ -3,6 +3,13 @@ source /scripts/common + +if chk_enabled "${TAR1090_DISABLE}"; then + rm -f /etc/nginx/sites-enabled/tar1090 + exit 0 +fi + + # create symlink so /var/cache/fontconfig is in tmpfs # as per Wiedehopf - https://discord.com/channels/734090820684349521/1102603003376177172/1203826726023729162 # shellcheck disable=SC2174