From 55790da3eba499246896d5afd9747039a387089d Mon Sep 17 00:00:00 2001 From: "Simon L." Date: Wed, 29 Apr 2026 14:32:49 +0200 Subject: [PATCH] caddy: revert being able to adjust the log level for it for now Signed-off-by: Simon L. --- Containers/apache/Caddyfile | 2 +- Containers/apache/start.sh | 2 -- Containers/mastercontainer/acme.Caddyfile | 5 ----- Containers/mastercontainer/internal.Caddyfile | 2 +- Containers/mastercontainer/start.sh | 2 -- 5 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Containers/apache/Caddyfile b/Containers/apache/Caddyfile index c593df6b..51a11604 100644 --- a/Containers/apache/Caddyfile +++ b/Containers/apache/Caddyfile @@ -10,7 +10,7 @@ } log { - level {$CADDY_LOG_LEVEL} + level ERROR } } diff --git a/Containers/apache/start.sh b/Containers/apache/start.sh index 27a0afaa..1b48bf8a 100644 --- a/Containers/apache/start.sh +++ b/Containers/apache/start.sh @@ -9,8 +9,6 @@ if [ -z "$NC_DOMAIN" ]; then exit 1 fi -CADDY_LOG_LEVEL="$(echo "$AIO_LOG_LEVEL" | tr '[:lower:]' '[:upper:]')" -export CADDY_LOG_LEVEL if [ "$AIO_LOG_LEVEL" = 'debug' ]; then export SUPERVISORD_STDOUT=/dev/stdout else diff --git a/Containers/mastercontainer/acme.Caddyfile b/Containers/mastercontainer/acme.Caddyfile index b51e0c3c..77d7df9e 100644 --- a/Containers/mastercontainer/acme.Caddyfile +++ b/Containers/mastercontainer/acme.Caddyfile @@ -10,11 +10,6 @@ } log { - # The log level is hardcoded here to ERROR by design. - # We need to mute two warnings printed to the logs: - # 1. admin endpoint disabled - # 2. Warning regarding on-demand tls - # See https://github.com/nextcloud/all-in-one#securing-the-aio-interface-from-unauthorized-acme-challenges level ERROR # We need to exclude the remote-host plugin from logging as it would spam the logs # See https://github.com/nextcloud/all-in-one/pull/7006#issuecomment-4003238239 diff --git a/Containers/mastercontainer/internal.Caddyfile b/Containers/mastercontainer/internal.Caddyfile index f9c1a648..9890acc0 100644 --- a/Containers/mastercontainer/internal.Caddyfile +++ b/Containers/mastercontainer/internal.Caddyfile @@ -9,7 +9,7 @@ } log { - level {$CADDY_LOG_LEVEL} + level ERROR # We need to exclude the remote-host plugin from logging as it would spam the logs # See https://github.com/nextcloud/all-in-one/pull/7006#issuecomment-4003238239 exclude http.matchers.remote_host diff --git a/Containers/mastercontainer/start.sh b/Containers/mastercontainer/start.sh index 7a808548..3551f690 100644 --- a/Containers/mastercontainer/start.sh +++ b/Containers/mastercontainer/start.sh @@ -347,13 +347,11 @@ if [ -z "$AIO_LOG_LEVEL" ]; then export AIO_LOG_LEVEL="warn" fi -CADDY_LOG_LEVEL="$(echo "$AIO_LOG_LEVEL" | tr '[:lower:]' '[:upper:]')" if [ "$AIO_LOG_LEVEL" = 'debug' ]; then export SUPERVISORD_STDOUT=/dev/stdout else export SUPERVISORD_STDOUT=NONE fi -export CADDY_LOG_LEVEL # Check if ghcr.io is reachable # Solves issues like https://github.com/nextcloud/all-in-one/discussions/5268