From bd33b898fe00013dcc2332176d6add1a0dccb2fd Mon Sep 17 00:00:00 2001
From: Noratrieb <48135649+Noratrieb@users.noreply.github.com>
Date: Wed, 7 Aug 2024 22:31:55 +0200
Subject: [PATCH] Caddy access logs

---
 newinfra/nix/modules/ingress/base.Caddyfile |  7 +++++++
 newinfra/nix/modules/ingress/default.nix    |  2 ++
 newinfra/nix/modules/ingress/vps1.Caddyfile | 14 ++++++++++++++
 newinfra/nix/modules/ingress/vps3.Caddyfile |  1 +
 4 files changed, 24 insertions(+)

diff --git a/newinfra/nix/modules/ingress/base.Caddyfile b/newinfra/nix/modules/ingress/base.Caddyfile
index 7ff7ce4..825ee15 100644
--- a/newinfra/nix/modules/ingress/base.Caddyfile
+++ b/newinfra/nix/modules/ingress/base.Caddyfile
@@ -14,13 +14,20 @@
 	servers {
 		metrics
 	}
+
+	log default {
+		output stdout
+		format json
+	}
 }
 
 http:// {
+	log
 	respond "This is an HTTPS-only server, silly you. Go to https:// instead." 418
 }
 
 # HTTP
 :9010 {
+	log
 	metrics /metrics
 }
diff --git a/newinfra/nix/modules/ingress/default.nix b/newinfra/nix/modules/ingress/default.nix
index 0748ffc..9b48b2a 100644
--- a/newinfra/nix/modules/ingress/default.nix
+++ b/newinfra/nix/modules/ingress/default.nix
@@ -39,6 +39,7 @@ in
         builtins.readFile ./base.Caddyfile +
         ''
           ${config.networking.hostName}.infra.noratrieb.dev {
+              log
               encode zstd gzip
               header -Last-Modified
               root * ${import ./caddy-static-prepare {
@@ -55,6 +56,7 @@ in
           ${
             if name == "vps1" || name == "vps3" || name == "vps4" then ''
             noratrieb.dev {
+                log
                 encode zstd gzip
                 header -Last-Modified2a01:4f8:1c1c:cb18::
                 root * ${import ./caddy-static-prepare {
diff --git a/newinfra/nix/modules/ingress/vps1.Caddyfile b/newinfra/nix/modules/ingress/vps1.Caddyfile
index 9045a34..19428da 100644
--- a/newinfra/nix/modules/ingress/vps1.Caddyfile
+++ b/newinfra/nix/modules/ingress/vps1.Caddyfile
@@ -25,64 +25,78 @@
 }
 
 www.noratrieb.dev {
+	log
 	redir https://noratrieb.dev{uri} permanent
 }
 
 uptime.noratrieb.dev {
+	log
 	encode zstd gzip
 	reverse_proxy * localhost:5010
 }
 
 hugo-chat.noratrieb.dev {
+	log
 	encode zstd gzip
 	reverse_proxy * localhost:5002
 }
 
 api.hugo-chat.noratrieb.dev {
+	log
 	import cors https://hugo-chat.noratrieb.dev "DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type"
 	encode zstd gzip
 	reverse_proxy * localhost:5001
 }
 
 bisect-rustc.noratrieb.dev {
+	log
 	encode zstd gzip
 	reverse_proxy * localhost:5005
 }
 
 docker.noratrieb.dev {
+	log
 	reverse_proxy * localhost:5000
 }
 
 ################################################################
 # deadname redirects
 nilstrieb.dev {
+	log
 	redir https://noratrieb.dev{uri} permanent
 }
 
 www.nilstrieb.dev {
+	log
 	redir https://noratrieb.dev{uri} permanent
 }
 
 blog.nilstrieb.dev {
+	log
 	redir https://noratrieb.dev/blog{uri} permanent
 }
 
 bisect-rustc.nilstrieb.dev {
+	log
 	redir https://bisect-rustc.dev/blog{uri} permanent
 }
 
 docker.nilstrieb.dev {
+	log
 	redir https://docker.noratrieb.dev{uri} permanent
 }
 
 hugo-chat.nilstrieb.dev {
+	log
 	redir https://hugo-chat.noratrieb.dev{uri} permanent
 }
 
 api.hugo-chat.nilstrieb.dev {
+	log
 	redir https://api.hugo-chat.noratrieb.dev{uri} permanent
 }
 
 uptime.nilstrieb.dev {
+	log
 	redir https://uptime.noratrieb.dev{uri} permanent
 }
diff --git a/newinfra/nix/modules/ingress/vps3.Caddyfile b/newinfra/nix/modules/ingress/vps3.Caddyfile
index bc9b1aa..d233f8d 100644
--- a/newinfra/nix/modules/ingress/vps3.Caddyfile
+++ b/newinfra/nix/modules/ingress/vps3.Caddyfile
@@ -1,4 +1,5 @@
 grafana.noratrieb.dev {
+	log
 	encode zstd gzip
 	reverse_proxy * localhost:3000
 }