From 16cf4014773345ff2f1f346f0b1575483a56bcb2 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Fri, 21 Mar 2025 20:07:06 -0400
Subject: [PATCH] minecraft: move map caddy config to minecraft.nix

---
 services/caddy.nix     | 6 ------
 services/minecraft.nix | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/services/caddy.nix b/services/caddy.nix
index 8e56c73..0863eeb 100644
--- a/services/caddy.nix
+++ b/services/caddy.nix
@@ -18,12 +18,6 @@
 
         serverAliases = [ "www.${service_configs.https.domain}" ];
       };
-
-      "map.${service_configs.https.domain}".extraConfig = ''
-        # tls internal
-        root * ${service_configs.minecraft.parent_dir}/${service_configs.minecraft.server_name}/squaremap/web
-        file_server browse
-      '';
     };
   };
 
diff --git a/services/minecraft.nix b/services/minecraft.nix
index ff7d772..702cbba 100644
--- a/services/minecraft.nix
+++ b/services/minecraft.nix
@@ -101,6 +101,12 @@ in
     };
   };
 
+  services.caddy.virtualHosts."map.${service_configs.https.domain}".extraConfig = ''
+    # tls internal
+    root * ${service_configs.minecraft.parent_dir}/${service_configs.minecraft.server_name}/squaremap/web
+    file_server browse
+  '';
+
   systemd.tmpfiles.rules = [
     "d ${service_configs.minecraft.parent_dir}/${service_configs.minecraft.server_name} 0770 minecraft minecraft"
   ];