From 12ca100843a334c56f5b13d876ceab4ac561fa47 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 8 Jul 2023 09:27:52 +0200
Subject: Fix erroneous 200 responses on missing files

Revert "Replace metrics with advanced metrics for path-based counters"

This reverts commit 3dcd97ff77e9f9f5e3ea2b97b9e15c7c1066859d.
---
 Caddyfile  | 10 +++++-----
 Dockerfile |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Caddyfile b/Caddyfile
index 9fce1be..df0cecc 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -4,14 +4,17 @@
 	auto_https disable_redirects
 	acme_ca https://acme.zerossl.com/v2/DV90
 	import globals/*
-	order advanced_metrics before file_server
-	order advanced_metrics before reverse_proxy
 	servers :80 {
+		metrics
 		protocols h1 h2c
 		trusted_proxies static private_ranges
 	}
 }
 
+:9091 {
+	metrics
+}
+
 http://,
 http://alanpearce.uk,
 http://www.alanpearce.uk,
@@ -35,9 +38,6 @@ http://aln.pe {
 }
 
 http://alanpearce.eu {
-	advanced_metrics {
-		port 9091
-	}
 	root * {$SITE_ROOT}
 	file_server {
 		precompressed br zstd gzip
diff --git a/Dockerfile b/Dockerfile
index 512d6c2..72dc719 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,8 +4,7 @@ ARG VARIANT=alpine
 FROM docker.io/caddy:${VERSION}-builder-${VARIANT} AS builder
 
 RUN xcaddy build \
-    --with github.com/gamalan/caddy-tlsredis \
-    --with github.com/sebastianbrunnert/caddy-advanced-metrics
+    --with github.com/gamalan/caddy-tlsredis
 
 FROM docker.io/caddy:${VERSION}-${VARIANT}
 
-- 
cgit 1.4.1