mirror of
https://github.com/nextcloud/all-in-one.git
synced 2026-05-21 10:50:10 +00:00
caddy: revert being able to adjust the log level for it for now
Signed-off-by: Simon L. <szaimen@e.mail.de>
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
}
|
||||
|
||||
log {
|
||||
level {$CADDY_LOG_LEVEL}
|
||||
level ERROR
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user