From 8a10cc7cea8145a62fb8f1a0f2dc6d71746d8688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremiah=20Men=C3=A9trey?= <superjun1@gmail.com>
Date: Sun, 4 Jun 2023 17:17:44 +0200
Subject: [PATCH] Fix config for latest caddy releases

The Commons Log format was dropped in caddy 2.5, cf. [1].

[1]: https://github.com/caddyserver/caddy/issues/4148
---
 .local/bin/webserver | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.local/bin/webserver b/.local/bin/webserver
index d45694e..f0f25ff 100755
--- a/.local/bin/webserver
+++ b/.local/bin/webserver
@@ -77,9 +77,7 @@ localhost:$IPORT
 root * /srv
 file_server browse
 
-log {
-    format single_field common_log
-}
+log
 
 handle_errors {
     handle {
@@ -89,8 +87,8 @@ handle_errors {
 EOF
 
 
-if (( UPDATE )) || ! podman image exists caddy; then
-    podman pull caddy
+if (( UPDATE )) || ! podman image exists docker.io/caddy; then
+    podman pull docker.io/caddy
 fi
 
 echo "Serving on ${BIND}:${EPORT}..."
@@ -98,4 +96,4 @@ podman run --rm -it \
     --publish "$BIND":"$EPORT":"$IPORT" \
     --volume "$CADDYFILE":/etc/caddy/Caddyfile \
     --volume "$ROOT":/srv:ro \
-    caddy
+    docker.io/caddy