feat: caddy test

config/instances/config/upRootNutrition.nix

@@ -17,6 +17,9 @@ in {
     path1 = "";
     path2 = "";
   };
+  ports = {
+    port0 = 1234;
+  };
   ssl = {
     cert = "${sslPath}/${domain3}/fullchain.pem";
     key = "${sslPath}/${domain3}/key.pem";

nixos/modules/services/mastodon/default.nix

@@ -8,7 +8,7 @@
   inherit (flake.config.machines.devices) server;
   inherit (flake.config.services.instances) mastodon web;
   service = mastodon;
-  host = web.domains.url1;
+  host = web.domains.url3;
   localhost = web.localhost.address0;
 in {
   # If you need to start fresh for some reason, run these to create the new Admin account:

nixos/modules/services/upRootNutrition.nix

@@ -1,9 +1,4 @@
-{
+{flake, ...}: let
-  flake,
-  config,
-  ...
-}: let
-  inherit (flake.config.machines.devices) server;
   inherit (flake.config.services.instances) upRootNutrition web;
   service = upRootNutrition;
   localhost = web.localhost.address0;
@@ -14,23 +9,12 @@ in {
       virtualHosts = {
         "${host}" = {
           extraConfig = ''
+            redir /.well-known/carddav /remote.php/dav/ 301
+            redir /.well-known/caldav /remote.php/dav/ 301
 
-            root * /var/lib/website
+            reverse_proxy ${localhost}:${toString service.ports.port0}
 
-            file_server
+            tls ${service.ssl.cert} ${service.ssl.key}
-
-            try_files {path} /index.html
-            encode gzip
-
-            header {
-              # Disable FLoC tracking
-              Permissions-Policy interest-cohort=()
-              # Enable HSTS
-              Strict-Transport-Security "max-age=31536000; includeSubDomains"
-              # Prevent MIME-type sniffing
-              X-Content-Type-Options nosniff
-
-              tls ${service.ssl.cert} ${service.ssl.key}
           '';
         };
       };