From ccf090b84162e1171cf83dea4e253628a0d76aeb Mon Sep 17 00:00:00 2001
From: Brendan Golden <git@brendan.ie>
Date: Sat, 27 Jan 2024 18:53:49 +0000
Subject: [PATCH] feat: Added functionality to have dns for non nixos servers

Closes #52
---
 applications/dns.nix | 88 +++++++++++++++++++++++---------------------
 config/dns.nix       | 46 +++++++++++++++++++++++
 2 files changed, 92 insertions(+), 42 deletions(-)
 create mode 100644 config/dns.nix

diff --git a/applications/dns.nix b/applications/dns.nix
index 973b956..b912991 100644
--- a/applications/dns.nix
+++ b/applications/dns.nix
@@ -240,47 +240,49 @@
     old = "";
   };
 
-  records = builtins.concatLists (
-    lib.attrsets.mapAttrsToList (
-      key: value: let
-        details_server = value.config.skynet_dns.server;
-        details_records = value.config.skynet_dns.records;
-      in
-        if builtins.hasAttr "skynet_dns" value.config
-        then
-          (
-            # got to handle habing a dns record for the dns serves themselves.
-            if details_server.enable
-            then
-              (
-                if details_server.primary
-                then
-                  details_records
-                  ++ [
-                    {
-                      record = "ns1";
-                      r_type = "A";
-                      value = details_server.ip;
-                      server = false;
-                    }
-                  ]
-                else
-                  details_records
-                  ++ [
-                    {
-                      record = "ns2";
-                      r_type = "A";
-                      value = details_server.ip;
-                      server = false;
-                    }
-                  ]
-              )
-            else details_records
-          )
-        else []
-    )
-    nodes
-  );
+  records =
+    config.skynet.records
+    ++ builtins.concatLists (
+      lib.attrsets.mapAttrsToList (
+        key: value: let
+          details_server = value.config.skynet_dns.server;
+          details_records = value.config.skynet_dns.records;
+        in
+          if builtins.hasAttr "skynet_dns" value.config
+          then
+            (
+              # got to handle habing a dns record for the dns serves themselves.
+              if details_server.enable
+              then
+                (
+                  if details_server.primary
+                  then
+                    details_records
+                    ++ [
+                      {
+                        record = "ns1";
+                        r_type = "A";
+                        value = details_server.ip;
+                        server = false;
+                      }
+                    ]
+                  else
+                    details_records
+                    ++ [
+                      {
+                        record = "ns2";
+                        r_type = "A";
+                        value = details_server.ip;
+                        server = false;
+                      }
+                    ]
+                )
+              else details_records
+            )
+          else []
+      )
+      nodes
+    );
 
   nameserver =
     if cfg.server.primary
@@ -288,7 +290,8 @@
     else "ns2";
 in {
   imports = [
-    ../applications/firewall.nix
+    ./firewall.nix
+    ../config/dns.nix
   ];
 
   options = {
@@ -313,6 +316,7 @@ in {
         };
       };
 
+      # mirrorred in ../config/dns.nix
       records = lib.mkOption {
         description = "Records, sorted based on therir type";
         type = with lib.types;
diff --git a/config/dns.nix b/config/dns.nix
new file mode 100644
index 0000000..24e45d3
--- /dev/null
+++ b/config/dns.nix
@@ -0,0 +1,46 @@
+{lib, ...}: {
+  imports = [
+    # Paths to other modules.
+    # Compose this module out of smaller ones.
+  ];
+
+  # this needs to mirror ../applications/dns.nix
+  options.skynet.records = lib.mkOption {
+    description = "Records, sorted based on therir type";
+    type = with lib.types;
+      listOf (submodule {
+        options = {
+          record = lib.mkOption {
+            type = str;
+          };
+          r_type = lib.mkOption {
+            type = enum ["A" "CNAME" "TXT" "PTR" "SRV" "MX"];
+          };
+          value = lib.mkOption {
+            type = str;
+          };
+          server = lib.mkOption {
+            description = "Core record for a server";
+            type = bool;
+            default = false;
+          };
+        };
+      });
+  };
+
+  config = {
+    skynet.records = [
+      #{
+      #  record = "bumblebee";
+      #  r_type = "A";
+      #  value = "193.1.99.91";
+      #  server = true;
+      #}
+      #{
+      #  record = "testing";
+      #  r_type = "CNAME";
+      #  value = "bumblebee";
+      #}
+    ];
+  };
+}
-- 
2.46.1