From 3d4aea8c5bca56d3b610d3333d9ccd321f3cebf3 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Tue, 10 Mar 2026 14:30:23 -0400
Subject: [PATCH] caddy: move to new domain

---
 service-configs.nix |  3 ++-
 services/caddy.nix  | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/service-configs.nix b/service-configs.nix
index cee64ee..aa90032 100644
--- a/service-configs.nix
+++ b/service-configs.nix
@@ -45,7 +45,8 @@ rec {
 
   https = {
     certs = services_dir + "/http_certs";
-    domain = "gardling.com";
+    domain = "sigkill.computer";
+    old_domain = "gardling.com"; # Redirect traffic from old domain
   };
 
   gitea = {
diff --git a/services/caddy.nix b/services/caddy.nix
index 856bb8b..1269acd 100644
--- a/services/caddy.nix
+++ b/services/caddy.nix
@@ -61,6 +61,22 @@ in
 
         serverAliases = [ "www.${service_configs.https.domain}" ];
       };
+
+      # Redirect old domain (bare) to new domain
+      ${service_configs.https.old_domain} = {
+        extraConfig = ''
+          redir https://${service_configs.https.domain}{uri} permanent
+        '';
+        serverAliases = [ "www.${service_configs.https.old_domain}" ];
+      };
+
+      # Redirect old domain (wildcard subdomains) to new domain
+      "*.${service_configs.https.old_domain}" = {
+        extraConfig = ''
+          # {labels.2} extracts the subdomain from *.gardling.com
+          redir https://{labels.2}.${service_configs.https.domain}{uri} permanent
+        '';
+      };
     };
   };