From 4f1201741a35176441a48a4573e21c65bdf78d4e Mon Sep 17 00:00:00 2001
From: Noratrieb <48135649+Noratrieb@users.noreply.github.com>
Date: Sat, 2 Aug 2025 14:27:20 +0200
Subject: [PATCH] files.noratrieb.dev

---
 newinfra/nix/modules/caddy/base.Caddyfile  | 26 ++++++++++++++++++++++
 newinfra/nix/modules/caddy/default.nix     |  7 ++++++
 newinfra/nix/modules/caddy/vps1.Caddyfile  | 26 ----------------------
 newinfra/nix/modules/dns/noratrieb.dev.nix |  1 +
 4 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/newinfra/nix/modules/caddy/base.Caddyfile b/newinfra/nix/modules/caddy/base.Caddyfile
index 825ee15..69a626b 100644
--- a/newinfra/nix/modules/caddy/base.Caddyfile
+++ b/newinfra/nix/modules/caddy/base.Caddyfile
@@ -21,6 +21,32 @@
 	}
 }
 
+# https://gist.github.com/ryanburnette/d13575c9ced201e73f8169d3a793c1a3
+(cors) {
+	@cors_preflight{args[0]} method OPTIONS
+	@cors{args[0]} header Origin {args[0]}
+
+	handle @cors_preflight{args[0]} {
+		header {
+			Access-Control-Allow-Origin "{args[0]}"
+			Access-Control-Allow-Methods "GET, POST, PUT, PATCH, DELETE, OPTIONS"
+			Access-Control-Allow-Credentials "false"
+			Access-Control-Allow-Headers "${args[1]}"
+			Access-Control-Max-Age "86400"
+			defer
+		}
+		respond "" 204
+	}
+
+	handle @cors{args[0]} {
+		header {
+			Access-Control-Allow-Origin "{args[0]}"
+			Access-Control-Expose-Headers *
+			defer
+		}
+	}
+}
+
 http:// {
 	log
 	respond "This is an HTTPS-only server, silly you. Go to https:// instead." 418
diff --git a/newinfra/nix/modules/caddy/default.nix b/newinfra/nix/modules/caddy/default.nix
index bbcb15a..07fd744 100644
--- a/newinfra/nix/modules/caddy/default.nix
+++ b/newinfra/nix/modules/caddy/default.nix
@@ -70,6 +70,13 @@ in
                     precompressed zstd gzip br
                 }
             }
+
+            files.noratrieb.dev {
+              log
+              encode zstd gzip
+
+              reverse_proxy * localhost:3902
+            }
             '' else ""
           }
 
diff --git a/newinfra/nix/modules/caddy/vps1.Caddyfile b/newinfra/nix/modules/caddy/vps1.Caddyfile
index e337003..38e5607 100644
--- a/newinfra/nix/modules/caddy/vps1.Caddyfile
+++ b/newinfra/nix/modules/caddy/vps1.Caddyfile
@@ -1,29 +1,3 @@
-# https://gist.github.com/ryanburnette/d13575c9ced201e73f8169d3a793c1a3
-(cors) {
-	@cors_preflight{args[0]} method OPTIONS
-	@cors{args[0]} header Origin {args[0]}
-
-	handle @cors_preflight{args[0]} {
-		header {
-			Access-Control-Allow-Origin "{args[0]}"
-			Access-Control-Allow-Methods "GET, POST, PUT, PATCH, DELETE, OPTIONS"
-			Access-Control-Allow-Credentials "false"
-			Access-Control-Allow-Headers "${args[1]}"
-			Access-Control-Max-Age "86400"
-			defer
-		}
-		respond "" 204
-	}
-
-	handle @cors{args[0]} {
-		header {
-			Access-Control-Allow-Origin "{args[0]}"
-			Access-Control-Expose-Headers *
-			defer
-		}
-	}
-}
-
 www.noratrieb.dev {
 	log
 	redir https://noratrieb.dev{uri} permanent
diff --git a/newinfra/nix/modules/dns/noratrieb.dev.nix b/newinfra/nix/modules/dns/noratrieb.dev.nix
index 8ff312e..c1e43c0 100644
--- a/newinfra/nix/modules/dns/noratrieb.dev.nix
+++ b/newinfra/nix/modules/dns/noratrieb.dev.nix
@@ -57,6 +57,7 @@ let
         # --- website stuff
         blog = vps1;
         www = vps1;
+        files = combine [ vps1 vps3 vps4 ];
 
         # --- legacy crap
         old-docker = vps2;