Improve verbosity for log output

docs/content/docs/8.reference/1.environment-variable-specification.md

@@ -65,7 +65,7 @@ Setting environment variables all depends on what method you're using to run you
 `HEALTHCHECK_PATH`<br />*Default: "/healthcheck"*|Set the path for the health check endpoint. (<a target="_blank" href="https://docs.docker.com/engine/reference/builder/#healthcheck">Official docs</a>)|all (except `cli` and `frankenphp`)
 `HEALTHCHECK_SSL_CERTIFICATE_FILE`<br />*Default: "/etc/ssl/healthcheck/localhost.crt"*|Set the path to the SSL certificate for the health check endpoint.| fpm-apache, fpm-nginx, frankenphp
 `HEALTHCHECK_SSL_PRIVATE_KEY_FILE`<br />*Default: "/etc/ssl/healthcheck/localhost.key"*|Set the path to the SSL private key for the health check endpoint.| fpm-apache, fpm-nginx, frankenphp
-`LOG_OUTPUT_LEVEL`<br />*Default:* <br /> *"warn" (for all)* <br /> *"info" (for frankenphp)*|Set your container output different verbosity levels: debug, warn, info, off |all
+`LOG_OUTPUT_LEVEL`<br />*Default:* <br /> *"warn" (for all)* <br /> *"info" (for frankenphp)*|Set the verbosity level for container output and service logs. Valid values (least to most verbose): `emerg`, `alert`, `crit`, `error`, `warn`, `notice`, `info`, `debug`. Each level is translated to the native log configuration for PHP, PHP-FPM, and the active web server. <br />ℹ️ FrankenPHP defaults to `info` because Caddy unifies access and error logs — setting `warn` would suppress HTTP request logs entirely (unlike Apache/NGINX where access logs are a separate directive).|all
 `NGINX_ACCESS_LOG`<br />*Default: "/dev/stdout"*|Set the default output stream for access log.|fpm-nginx
 `NGINX_ERROR_LOG`<br />*Default: "/dev/stderr"*|Set the default output stream for error log.|fpm-nginx
 `NGINX_FASTCGI_BUFFERS`<br />*Default: "8 8k"*|Sets the number and size of the buffers used for reading a response from a FastCGI server. (<a target="_blank" href="https://nginx.org/en/docs/http/ngx_http_fastcgi_module.html#fastcgi_buffers">Official Docs</a>)|fpm-nginx

src/common/etc/entrypoint.d/0-container-info.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
-if [ "$SHOW_WELCOME_MESSAGE" = "false" ] || [ "$LOG_OUTPUT_LEVEL" = "off" ] || [ "$DISABLE_DEFAULT_CONFIG" = "true" ]; then
+if [ "$SHOW_WELCOME_MESSAGE" = "false" ] || [ "$DISABLE_DEFAULT_CONFIG" = "true" ]; then
     if [ "$LOG_OUTPUT_LEVEL" = "debug" ]; then
-        echo "👉 $0: Container info was display was skipped."
+        echo "👉 $0: Container info display was skipped."
     fi
     # Skip the rest of the script
     exit 0

src/common/usr/local/bin/docker-php-serversideup-entrypoint

@@ -13,7 +13,7 @@ fi
 
 # Check if the default command is being used
 case "$1" in
-    "/init" | "php-fpm")
+    "/init" | "php-fpm" | "frankenphp")
         SERVERSIDEUP_DEFAULT_COMMAND="true"
         ;;
 esac

src/utilities-webservers/etc/entrypoint.d/5-generate-ssl.sh

@@ -9,14 +9,23 @@ if [ "$DISABLE_DEFAULT_CONFIG" = "true" ]; then
     exit 0
 fi
 
+if [ "$SERVERSIDEUP_DEFAULT_COMMAND" != "true" ]; then
+    if [ "$LOG_OUTPUT_LEVEL" = "debug" ]; then
+        echo "👉 $script_name: SERVERSIDEUP_DEFAULT_COMMAND is not true, so we won't generate a self-signed SSL key pair."
+    fi
+    exit 0
+fi
+
 SSL_CERTIFICATE_FILE=${SSL_CERTIFICATE_FILE:-"/etc/ssl/private/self-signed-web.crt"}
 SSL_PRIVATE_KEY_FILE=${SSL_PRIVATE_KEY_FILE:-"/etc/ssl/private/self-signed-web.key"}
 SSL_MODE=${SSL_MODE:-"off"}
 HEALTHCHECK_SSL_CERTIFICATE_FILE=${HEALTHCHECK_SSL_CERTIFICATE_FILE:-"/etc/ssl/healthcheck/localhost.crt"}
 HEALTHCHECK_SSL_PRIVATE_KEY_FILE=${HEALTHCHECK_SSL_PRIVATE_KEY_FILE:-"/etc/ssl/healthcheck/localhost.key"}
 
 if [ "$SSL_MODE" = "off" ]; then
-    echo "ℹ️ NOTICE ($script_name): SSL mode is off, so we won't generate a self-signed SSL key pair."
+    if [ "$LOG_OUTPUT_LEVEL" = "debug" ]; then
+        echo "👉 $script_name: SSL mode is off, so we won't generate a self-signed SSL key pair."
+    fi
     return 0
 fi
 
@@ -45,7 +54,9 @@ if [ -d "/etc/frankenphp/" ]; then
 fi
 
 if [ -f "$SSL_CERTIFICATE_FILE" ] && [ -f "$SSL_PRIVATE_KEY_FILE" ]; then
-    echo "ℹ️ NOTICE ($script_name): SSL certificate and private key already exist, so we'll use the existing files."
+    if [ "$LOG_OUTPUT_LEVEL" = "debug" ]; then
+        echo "👉 $script_name: SSL certificate and private key already exist, so we'll use the existing files."
+    fi
     return 0
 fi
 

src/variations/frankenphp/etc/frankenphp/log-level/address/debug.caddyfile

@@ -1,5 +1,5 @@
 log {
 	format {$CADDY_LOG_FORMAT:console}
 	output {$CADDY_LOG_OUTPUT:stdout}
-	level {$CADDY_SERVER_LOG_LEVEL:INFO}
+	level {$CADDY_SERVER_LOG_LEVEL:DEBUG}
 }