all repos — nixfiles @ 6dfb897229989f9e4515ff15644526086e70109e

System and user configuration, managed by nix and home-manager

extract wildcard subdomain redirection to role

Alin
commit

6dfb897229989f9e4515ff15644526086e70109e

parent

5daa66fd9b3c12064ce35febaf311caba30bfd24

2 files changed, 24 insertions(+), 12 deletions(-)

changed files
M system/hosts/linde.nix → system/hosts/linde.nix
@@ -267,12 +267,6 @@ services.powerdns.extraConfig = ''
     local-address=${net-ip4} ${net-ip6}
   '';
 
-  security.acme = {
-    certs."${oldDomain}" = {
-      extraDomainNames = [ "*.${oldDomain}" ];
-    };
-  };
-
   services.caddy = {
     virtualHosts =
       let

@@ -301,12 +295,6 @@ encode zstd gzip
             ${security-headers { }}
             root * /srv/http/go
             file_server
-          '';
-        };
-        "*.${oldDomain}" = {
-          useACMEHost = "${oldDomain}";
-          extraConfig = ''
-            redir https://{labels.2}.${domain}{uri}
           '';
         };
       };
A system/roles/subdomain-redirector.nix
@@ -0,0 +1,24 @@
+{
+  config,
+  ...
+}:
+let
+  newDomain = config.networking.domain;
+  oldDomain = "alanpearce.eu";
+in
+{
+  security.acme = {
+    certs."${oldDomain}" = {
+      extraDomainNames = [ "*.${oldDomain}" ];
+    };
+  };
+
+  services.caddy.virtualHosts = {
+    "*.${oldDomain}" = {
+      useACMEHost = "${oldDomain}";
+      extraConfig = ''
+        redir https://{labels.2}.${newDomain}{uri}
+      '';
+    };
+  };
+}