Merge branch 'main' of https://gitlab.skynet.ie/compsoc1/skynet/nixos

.gitlab-ci.yml

@@ -78,6 +78,7 @@ sync_repos:
       - secrets/**/*
       - flake.*
       - .gitlab-ci.yml
+      - config/**/*
 
 # deploy items only run on main
 .deploy_template: &deployment
@@ -92,6 +93,7 @@ sync_repos:
         - applications/**/*
         - machines/**/*
         - secrets/**/*
+        - config/**/*
 
 linter:
   <<: *builder

applications/dns.nix

@@ -240,7 +240,9 @@
     old = "";
   };
 
-  records = builtins.concatLists (
+  records =
+    config.skynet.records
+    ++ builtins.concatLists (
       lib.attrsets.mapAttrsToList (
         key: value: let
           details_server = value.config.skynet_dns.server;
@@ -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;

config/dns.nix

@@ -0,0 +1,57 @@
+{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 = "optimus-reborn";
+        r_type = "A";
+        value = "193.1.99.90";
+        server = true;
+      }
+      {
+        record = "panel.games";
+        r_type = "CNAME";
+        value = "optimus-reborn";
+      }
+      #{
+      #  record = "bumblebee";
+      #  r_type = "A";
+      #  value = "193.1.99.91";
+      #  server = true;
+      #}
+      #{
+      #  record = "testing";
+      #  r_type = "CNAME";
+      #  value = "bumblebee";
+      #}
+    ];
+  };
+}