nameservers/overlay: Refactor

This commit is contained in:
SebastianStork 2026-03-01 22:57:43 +01:00
parent 7d0224d248
commit d696787ae7
Signed by: SebastianStork
SSH key fingerprint: SHA256:tRrGdjYOwgHxpSc/wTOZQZEjxcb15P0tyXRsbAfd+2Q

View file

@ -10,12 +10,13 @@ let
cfg = config.custom.services.nameservers.overlay; cfg = config.custom.services.nameservers.overlay;
netCfg = config.custom.networking; netCfg = config.custom.networking;
zoneData = { zoneData = inputs.dns.lib.toString netCfg.overlay.domain {
SOA = { SOA = {
nameServer = "${netCfg.overlay.fqdn}."; nameServer = "${netCfg.overlay.fqdn}.";
adminEmail = "hostmaster@sstork.dev"; adminEmail = "hostmaster@sstork.dev";
serial = 1; serial = 1;
}; };
NS = NS =
allHosts allHosts
|> lib.attrValues |> lib.attrValues
@ -24,7 +25,7 @@ let
subdomains = subdomains =
let let
mkRecord = mkSubdomain =
{ name, address }: { name, address }:
{ {
inherit name; inherit name;
@ -33,13 +34,11 @@ let
nodeRecords = nodeRecords =
netCfg.nodes netCfg.nodes
|> lib.map ( |> lib.map (node: {
node:
mkRecord {
name = node.hostName; name = node.hostName;
inherit (node.overlay) address; inherit (node.overlay) address;
} });
);
serviceRecords = serviceRecords =
allHosts allHosts
|> lib.attrValues |> lib.attrValues
@ -49,16 +48,13 @@ let
|> lib.attrValues |> lib.attrValues
|> lib.map (vHost: vHost.domain) |> lib.map (vHost: vHost.domain)
|> lib.filter (domain: self.lib.isPrivateDomain domain) |> lib.filter (domain: self.lib.isPrivateDomain domain)
|> lib.map ( |> lib.map (domain: {
domain:
mkRecord {
name = domain |> lib.removeSuffix ".${netCfg.overlay.domain}"; name = domain |> lib.removeSuffix ".${netCfg.overlay.domain}";
inherit (host.config.custom.networking.overlay) address; inherit (host.config.custom.networking.overlay) address;
} })
)
); );
in in
(nodeRecords ++ serviceRecords) |> lib.listToAttrs; (nodeRecords ++ serviceRecords) |> lib.map mkSubdomain |> lib.listToAttrs;
}; };
in in
{ {
@ -69,7 +65,7 @@ in
nsd = { nsd = {
enable = true; enable = true;
interfaces = [ netCfg.overlay.interface ]; interfaces = [ netCfg.overlay.interface ];
zones.${netCfg.overlay.domain}.data = zoneData |> inputs.dns.lib.toString netCfg.overlay.domain; zones.${netCfg.overlay.domain}.data = zoneData;
}; };
nebula.networks.mesh.firewall.inbound = lib.singleton { nebula.networks.mesh.firewall.inbound = lib.singleton {