From 016a0d305c80fee5fdec5e2021c9634d5bb3f0d5 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Wed, 28 Apr 2021 01:35:11 +0100
Subject: [PATCH] modules/nixos: Moved tf stuff into tf-glue module

---
 modules/nixos/katnet/default.nix  | 15 ---------------
 modules/nixos/tf-glue/default.nix | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/modules/nixos/katnet/default.nix b/modules/nixos/katnet/default.nix
index b149d507..188c16f2 100644
--- a/modules/nixos/katnet/default.nix
+++ b/modules/nixos/katnet/default.nix
@@ -70,20 +70,5 @@ in {
         (map (interface: nameValuePair interface (interfaceDef visibility))
           cfg.${visibility}.interfaces);
     in mkMerge (map (visibility: interfaces visibility) [ "public" "private" ]);
-
-    deploy.tf.dns.records."kittywitch_net_${config.networking.hostName}" =
-      mkIf config.hexchen.network.enable {
-        tld = "kittywit.ch.";
-        domain = "${config.networking.hostName}.net";
-        aaaa.address = config.hexchen.network.address;
-      };
-
-    security.acme.certs."${config.networking.hostName}.net.kittywit.ch" =
-      mkIf (config.services.nginx.enable && config.hexchen.network.enable) {
-        domain = "${config.networking.hostName}.net.kittywit.ch";
-        dnsProvider = "rfc2136";
-        credentialsFile = config.secrets.files.dns_creds.path;
-        group = "nginx";
-      };
   };
 }
diff --git a/modules/nixos/tf-glue/default.nix b/modules/nixos/tf-glue/default.nix
index 3e4dc1b7..be469f1e 100644
--- a/modules/nixos/tf-glue/default.nix
+++ b/modules/nixos/tf-glue/default.nix
@@ -26,6 +26,20 @@ in {
       attrs = [ "out" "attrs" ];
       out.set = removeAttrs cfg cfg.attrs;
     };
+    deploy.tf.dns.records."kittywitch_net_${config.networking.hostName}" =
+      mkIf (config.hexchen.network.enable) {
+        tld = "kittywit.ch.";
+        domain = "${config.networking.hostName}.net";
+        aaaa.address = config.hexchen.network.address;
+      };
+
+    security.acme.certs."${config.networking.hostName}.net.kittywit.ch" =
+      mkIf (config.services.nginx.enable && config.hexchen.network.enable) {
+        domain = "${config.networking.hostName}.net.kittywit.ch";
+        dnsProvider = "rfc2136";
+        credentialsFile = config.secrets.files.dns_creds.path;
+        group = "nginx";
+      };
     _module.args.tf = target.${config.deploy.target};
   };
 }