From 4c81b9ec5d2099fd203724300b90e598592e9ced Mon Sep 17 00:00:00 2001 From: j Date: Sat, 3 Jan 2026 09:58:01 +1300 Subject: [PATCH] Update 2 files --- caddy/config/caddyfile/Caddyfile | 4 ++-- caddy/config/caddyfile/check_caddyfile.sh | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/caddy/config/caddyfile/Caddyfile b/caddy/config/caddyfile/Caddyfile index 37df71e..3a7b2a4 100644 --- a/caddy/config/caddyfile/Caddyfile +++ b/caddy/config/caddyfile/Caddyfile @@ -1,6 +1,6 @@ # See https://caddyserver.com/docs/caddyfile localhost { -root * /static -file_server + root * /static + file_server } diff --git a/caddy/config/caddyfile/check_caddyfile.sh b/caddy/config/caddyfile/check_caddyfile.sh index 601a573..af32e75 100755 --- a/caddy/config/caddyfile/check_caddyfile.sh +++ b/caddy/config/caddyfile/check_caddyfile.sh @@ -3,6 +3,11 @@ set -euo pipefail SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" +# Format first - will fail on syntax errors, avoids "not formatted" warning during validate docker run --rm -v "${SCRIPT_DIR}/Caddyfile:/etc/caddy/Caddyfile" caddy caddy fmt --overwrite /etc/caddy/Caddyfile + +# Validate - deeper check including provisioning (e.g., missing cert files) docker run --rm -v "${SCRIPT_DIR}/Caddyfile:/etc/caddy/Caddyfile" caddy caddy validate --config /etc/caddy/Caddyfile +echo "Caddyfile is valid and formatted" +