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

It's not even getting to zoneToZonefile...

This commit is contained in:
niten 2023-10-05 11:49:21 -07:00
parent af81439530
commit b99c7cf8ee
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
authoritative-dns.nix
View File

@ -6,6 +6,8 @@ let
zoneOpts = import ./zone-definition.nix { inherit lib; }; zoneOpts = import ./zone-definition.nix { inherit lib; };
zoneToZonefile = import ./zone-to-zonefile.nix { inherit lib; };
domainOpts = { name, ... }: { domainOpts = { name, ... }: {
options = with types; { options = with types; {
domain = mkOption { domain = mkOption {
@ -75,9 +77,13 @@ in {
zones = mapAttrs' (dom: domCfg: zones = mapAttrs' (dom: domCfg:
let zoneCfg = domCfg.zone; let zoneCfg = domCfg.zone;
in nameValuePair "${dom}." { in nameValuePair "${dom}." {
dnssec = domCfg.ksk.key-file != null; dnssec = zoneCfg.ksk.key-file != null;
ksk.keyFile = domCfg.ksk.key-file; ksk.keyFile =
data = zoneToZonefile cfg.timestamp dom domCfg.zone-definition; mkIf (zoneCfg.ksk.key-file != null) zoneCfg.ksk.key-file;
data = let
content = zoneToZonefile cfg.timestamp dom domCfg.zone-definition;
in trace content content;
}) cfg.domains; }) cfg.domains;
}; };
}; };

2
nsd.nix
View File

@ -167,7 +167,7 @@ let
zone: zone:
name: "${name}" name: "${name}"
zonefile: "${stateDir}/zones/${mkZoneFileName name}" zonefile: "${stateDir}/zones/${mkZoneFileName name}"
${maybeConfig "outgoing-interface: " zone.outgoingInterface}
${forEach " rrl-whitelist: " zone.rrlWhitelist} ${forEach " rrl-whitelist: " zone.rrlWhitelist}
${maybeConfig "zonestats: " zone.zoneStats} ${maybeConfig "zonestats: " zone.zoneStats}

5
zone-to-zonefile.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, ... }: { lib, ... }:
with lib;
{ timestamp, domain, zone, ... }: { timestamp, domain, zone, ... }:
with lib;
let let
removeBlankLines = str: removeBlankLines = str:
concatStringsSep "\n\n" (filter isString (split '' concatStringsSep "\n\n" (filter isString (split ''