conduit and other changes

services/caddy.nix

@@ -51,25 +51,43 @@
         root * ${service_configs.minecraft.parent_dir}/${service_configs.minecraft.server_name}/squaremap/web
         file_server browse
       '';
+
+      "${config.services.matrix-conduit.settings.global.server_name}".extraConfig = ''
+        reverse_proxy :${builtins.toString config.services.matrix-conduit.settings.global.port}
+      '';
+
+      # Exact duplicate of matrix.gardling.com
+      "${config.services.matrix-conduit.settings.global.server_name}:8448".extraConfig =
+        config.services.caddy.virtualHosts."${config.services.matrix-conduit.settings.global.server_name
+        }".extraConfig;
     };
   };
 
   systemd.tmpfiles.rules = [
-    "d ${service_configs.https.data_dir} 0755 ${config.services.caddy.user} ${config.services.caddy.group}"
+    "d ${service_configs.https.data_dir} 0750 ${config.services.caddy.user} ${config.services.caddy.group}"
   ];
 
   systemd.packages = with pkgs; [ nssTools ];
 
   networking.firewall.allowedTCPPorts = [
     service_configs.ports.https
+
+    # http (but really acmeCA challenges)
     80
+
+    # for matrix federation
+    8448
   ];
 
   networking.firewall.allowedUDPPorts = [
     service_configs.ports.https
+
+    # for matrix federation
+    8448
   ];
 
   users.users.${config.services.caddy.user}.extraGroups = [
+    # for `map.gardling.com`
     "minecraft"
   ];