feat: Added functionality to have dns for non nixos servers #115

Merged
silver merged 1 commit from #52-dns-for-non-nixos into main 2024-01-27 19:05:56 +00:00
2 changed files with 92 additions and 42 deletions
Showing only changes of commit ccf090b841 - Show all commits

View file

@ -240,47 +240,49 @@
old = ""; old = "";
}; };
records = builtins.concatLists ( records =
lib.attrsets.mapAttrsToList ( config.skynet.records
key: value: let ++ builtins.concatLists (
details_server = value.config.skynet_dns.server; lib.attrsets.mapAttrsToList (
details_records = value.config.skynet_dns.records; key: value: let
in details_server = value.config.skynet_dns.server;
if builtins.hasAttr "skynet_dns" value.config details_records = value.config.skynet_dns.records;
then in
( if builtins.hasAttr "skynet_dns" value.config
# got to handle habing a dns record for the dns serves themselves. then
if details_server.enable (
then # got to handle habing a dns record for the dns serves themselves.
( if details_server.enable
if details_server.primary then
then (
details_records if details_server.primary
++ [ then
{ details_records
record = "ns1"; ++ [
r_type = "A"; {
value = details_server.ip; record = "ns1";
server = false; r_type = "A";
} value = details_server.ip;
] server = false;
else }
details_records ]
++ [ else
{ details_records
record = "ns2"; ++ [
r_type = "A"; {
value = details_server.ip; record = "ns2";
server = false; r_type = "A";
} value = details_server.ip;
] server = false;
) }
else details_records ]
) )
else [] else details_records
) )
nodes else []
); )
nodes
);
nameserver = nameserver =
if cfg.server.primary if cfg.server.primary
@ -288,7 +290,8 @@
else "ns2"; else "ns2";
in { in {
imports = [ imports = [
../applications/firewall.nix ./firewall.nix
../config/dns.nix
]; ];
options = { options = {
@ -313,6 +316,7 @@ in {
}; };
}; };
# mirrorred in ../config/dns.nix
records = lib.mkOption { records = lib.mkOption {
description = "Records, sorted based on therir type"; description = "Records, sorted based on therir type";
type = with lib.types; type = with lib.types;

46
config/dns.nix Normal file
View file

@ -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";
#}
];
};
}