move uptime

newinfra/nix/modules/dns/nilstrieb.dev.nix

@@ -14,11 +14,11 @@ let
       };
     in
     with hostsToDns;
-    # point nilstrieb.dev to vps1
+    # point nilstrieb.dev to vps1 (retired)
     vps1 // {
       SOA = {
-        nameServer = "ns1.nilstrieb.dev";
-        adminEmail = "void@noratrieb.dev";
+        nameServer = "ns1.nilstrieb.dev.";
+        adminEmail = "void@nilstrieb.dev";
         serial = 2024072601;
       };
 
@@ -41,34 +41,33 @@ let
         ns1 = dns1;
         ns2 = dns2;
 
-        www = vps2;
-        blog = vps1;
-
         # apps
         bisect-rustc = vps2;
         cors-school = vps2 // {
           subdomains.api = vps2;
         };
         docker = vps2;
-        hugo-chat = vps2 // {
-          subdomains.api = vps2;
-        };
         olat = vps2;
-        uptime = vps2;
 
         localhost.A = [ (a "127.0.0.1") ];
 
+        # --- retired:
+        blog = vps1;
+        www = vps1;
+        uptime = vps1;
+        hugo-chat = vps1 // {
+          subdomains.api = vps1;
+        };
+        # ---
+
         # infra (legacy)
         inherit vps1;
         inherit vps2;
-        inherit dns1;
-        inherit dns2;
 
         pronouns.TXT = [
           "TODO"
         ];
 
-        newtest.TXT = [ "uwu it works" ];
         bsky.subdomains.atproto.TXT = [ "did=did:plc:pqyzoyxk7gfcbxk65mjyncyl" ];
       };
     };

newinfra/nix/modules/dns/noratrieb.dev.nix

@@ -17,7 +17,7 @@ let
     # vps1 contains root noratrieb.dev
     vps1 // {
       SOA = {
-        nameServer = "ns1.noratrieb.dev";
+        nameServer = "ns1.noratrieb.dev.";
         adminEmail = "void@noratrieb.dev";
         serial = 2024072601;
       };
@@ -28,28 +28,32 @@ let
       ];
 
       subdomains = {
+        # --- NS records
         ns1 = dns1;
         ns2 = dns2;
 
+        # --- website stuff
         blog.CNAME = map (ttl hour1) [ (cname "noratrieb.github.io") ];
+        www = vps1;
 
-        www.CNAME = [ (cname "noratrieb.dev") ];
-        pronouns.TXT = [
-          "she/her"
-        ];
+        # --- legacy crap
+        vps2 = vps2; # TODO REMOVE
         docker = vps2;
 
-        vps2 = vps2; # TODO REMOVE
-
+        # --- apps
+        uptime = vps1;
         hugo-chat = vps1 // {
           subdomains.api = vps1;
         };
 
-        test1.A = vps1.A ++ vps3.A;
-
+        # --- fun shit
         localhost.A = [ (a "127.0.0.1") ];
         newtest.TXT = [ "uwu it works" ];
+        pronouns.TXT = [
+          "she/her"
+        ];
 
+        # --- infra
         infra.subdomains = hostsToDns;
       };
     };

newinfra/nix/modules/ingress/Caddyfile

@@ -24,12 +24,20 @@
 	}
 }
 
+www.noratrieb.dev {
+	redir https://noratrieb.dev{uri} permanent
+}
+
+uptime.noratrieb.dev {
+	reverse_proxy * vps1.local:5010
+}
+
 hugo-chat.noratrieb.dev {
 	reverse_proxy * vps1.local:5002
 }
 
-api.cors-school.noratrieb.dev {
-	import cors https://cors-school.noratrieb.dev "DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,token,refresh-token,Authorization"
+api.hugo-chat.noratrieb.dev {
+	import cors https://hugo-chat.noratrieb.dev "DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type"
 	reverse_proxy * vps1.local:5001
 }
 
@@ -39,6 +47,10 @@ nilstrieb.dev {
 	redir https://noratrieb.dev{uri} permanent
 }
 
+www.nilstrieb.dev {
+	redir https://noratrieb.dev{uri} permanent
+}
+
 blog.nilstrieb.dev {
 	redir https://blog.noratrieb.dev{uri} permanent
 }
@@ -50,3 +62,7 @@ hugo-chat.nilstrieb.dev {
 api.hugo-chat.nilstrieb.dev {
 	redir https://api.hugo-chat.noratrieb.dev{uri} permanent
 }
+
+uptime.nilstrieb.dev {
+	redir https://uptime.noratrieb.dev{uri} permanent
+}