daenamnu/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2026-06-01 16:30:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add AIO_LOG_LEVEL env to configure log level across all main containers

Browse Source 
Agent-Logs-Url: https://github.com/nextcloud/all-in-one/sessions/cd05ca56-d0e8-4260-988b-a7cc0747beff

Co-authored-by: szaimen <42591237+szaimen@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-04-13 15:54:10 +00:00
committed by GitHub
parent c104b179b7
commit 039bd42592
21 changed files with 300 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Containers/apache/start.sh
View File

@@ -36,6 +36,15 @@ else
export PROTOCOL="https"
fi
# Apply log level to Caddy and Apache httpd
case "${AIO_LOG_LEVEL:-warning}" in
debug) CADDY_LOG_LEVEL="DEBUG"; APACHE_LOG_LEVEL="debug" ;;
info) CADDY_LOG_LEVEL="INFO"; APACHE_LOG_LEVEL="info" ;;
warning) CADDY_LOG_LEVEL="WARN"; APACHE_LOG_LEVEL="warn" ;;
error) CADDY_LOG_LEVEL="ERROR"; APACHE_LOG_LEVEL="error" ;;
*) CADDY_LOG_LEVEL="WARN"; APACHE_LOG_LEVEL="warn" ;;
esac
# Change the auto_https in case of reverse proxies
if [ "$APACHE_PORT" != '443' ]; then
CADDYFILE="$(sed 's|auto_https.*|auto_https off|' /Caddyfile)"
@@ -44,6 +53,10 @@ else
fi
echo "$CADDYFILE" > /tmp/Caddyfile
# Apply Caddy log level
CADDYFILE="$(sed "s|level [A-Z]*|level $CADDY_LOG_LEVEL|" /tmp/Caddyfile)"
echo "$CADDYFILE" > /tmp/Caddyfile
# Change the trusted_proxies in case of reverse proxies
if [ "$APACHE_PORT" != '443' ]; then
# Here the 100.64.0.0/10 range gets added which is the CGNAT range used by Tailscale nodes
@@ -74,4 +87,18 @@ fi
# Fix apache startup
rm -f /usr/local/apache2/logs/httpd.pid
exec "$@"
# Apply Apache httpd log level
sed -i "s|LogLevel [a-z]*|LogLevel $APACHE_LOG_LEVEL|" /usr/local/apache2/conf/nextcloud.conf
# Apply supervisord log level (supervisord.conf is not writable by this user, so use /tmp copy)
case "${AIO_LOG_LEVEL:-warning}" in
debug) SUPERVISORD_LOG_LEVEL="debug" ;;
info) SUPERVISORD_LOG_LEVEL="info" ;;
warning) SUPERVISORD_LOG_LEVEL="warn" ;;
error) SUPERVISORD_LOG_LEVEL="error" ;;
*) SUPERVISORD_LOG_LEVEL="warn" ;;
esac
cp /supervisord.conf /tmp/supervisord.conf
sed -i "s|loglevel=.*|loglevel=$SUPERVISORD_LOG_LEVEL|" /tmp/supervisord.conf
exec /usr/bin/supervisord -c /tmp/supervisord.conf