public
/
authoritative-dns
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove references to domainOpts

This commit is contained in:
niten 2023-11-03 13:13:10 -07:00
parent aa331b5b48
commit d95eb5e99e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
authoritative-dns.nix
View File

@ -91,19 +91,19 @@ in {
interfaces = cfg.listen-ips; interfaces = cfg.listen-ips;
stateDirectory = cfg.state-directory; stateDirectory = cfg.state-directory;
zones = let zones = let
forwardZones = mapAttrs' (domain: domainCfg: forwardZones = mapAttrs' (domain:
{ ksk, zone, ... }:
nameValuePair "${domain}." { nameValuePair "${domain}." {
dnssec = domainCfg.ksk.key-file != null; dnssec = ksk.key-file != null;
ksk.keyFile = ksk.keyFile = ksk.key-file;
mkIf (domainCfg.ksk.key-file != null) domainCfg.ksk.key-file;
data = zoneToZonefile { data = zoneToZonefile {
inherit domain; inherit domain;
inherit (cfg) timestamp; inherit (cfg) timestamp;
inherit (domainCfg) zone; inherit zone;
}; };
}) cfg.domains; }) cfg.domains;
reverseZones = concatMapAttrs (domain: reverseZones = concatMapAttrs (domain:
{ ksk, zone, ... }: { ksk, zone, reverse-zones, ... }:
listToAttrs (map (network: listToAttrs (map (network:
reverseZonefile { reverseZonefile {
inherit domain network ksk; inherit domain network ksk;
@ -111,7 +111,7 @@ in {
keyFile = ksk.key-file; keyFile = ksk.key-file;
ipHostMap = cfg.ip-host-map; ipHostMap = cfg.ip-host-map;
serial = cfg.timestamp; serial = cfg.timestamp;
}) domainOpts.reverse-zones)) cfg.domains; }) reverse-zones)) cfg.domains;
in forwardZones // reverseZones; in forwardZones // reverseZones;
}; };
}; };