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

Silly tweaks...

This commit is contained in:
niten 2023-10-05 13:30:27 -07:00
parent 205e418519
commit 899a3b45e5
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
authoritative-dns.nix
View File

@ -75,8 +75,7 @@ in {
interfaces = cfg.listen-ips; interfaces = cfg.listen-ips;
stateDirectory = cfg.state-directory; stateDirectory = cfg.state-directory;
zones = mapAttrs' (dom: domCfg: zones = mapAttrs' (dom: domCfg:
let zoneCfg = domCfg.zone; nameValuePair "${dom}." {
in nameValuePair "${dom}." {
dnssec = zoneCfg.ksk.key-file != null; dnssec = zoneCfg.ksk.key-file != null;
ksk.keyFile = ksk.keyFile =
mkIf (zoneCfg.ksk.key-file != null) zoneCfg.ksk.key-file; mkIf (zoneCfg.ksk.key-file != null) zoneCfg.ksk.key-file;

6
nsd.nix
View File

@ -315,9 +315,10 @@ let
ksk = { ksk = {
keyFile = mkOption { keyFile = mkOption {
type = types.str; type = nullOr types.str;
description = description =
"Location of the zone key-signing key file on the local host."; "Location of the zone key-signing key file on the local host.";
default = null;
}; };
}; };
@ -1058,8 +1059,5 @@ in {
/run/current-system/systemd/bin/systemctl kill -s SIGHUP nsd.service /run/current-system/systemd/bin/systemctl kill -s SIGHUP nsd.service
''; '';
}; };
}; };
meta.maintainers = with lib.maintainers; [ hrdinka ];
} }