From c50d2f82bdb347c9825324195ed6117f1602c270 Mon Sep 17 00:00:00 2001 From: niten Date: Thu, 5 Oct 2023 11:58:11 -0700 Subject: [PATCH] Just don't include any zones for now --- authoritative-dns.nix | 21 ++++++++++----------- zone-to-zonefile.nix | 1 - 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/authoritative-dns.nix b/authoritative-dns.nix index fd4760d..ce1c943 100644 --- a/authoritative-dns.nix +++ b/authoritative-dns.nix @@ -74,17 +74,16 @@ in { identity = cfg.identity; interfaces = cfg.listen-ips; stateDirectory = cfg.state-directory; - zones = mapAttrs' (dom: domCfg: - let zoneCfg = domCfg.zone; - in nameValuePair "${dom}." { - dnssec = zoneCfg.ksk.key-file != null; - ksk.keyFile = - 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; + # zones = mapAttrs' (dom: domCfg: + # let zoneCfg = domCfg.zone; + # in nameValuePair "${dom}." { + # dnssec = zoneCfg.ksk.key-file != null; + # ksk.keyFile = + # 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; }; }; } diff --git a/zone-to-zonefile.nix b/zone-to-zonefile.nix index e45e178..a2e00a4 100644 --- a/zone-to-zonefile.nix +++ b/zone-to-zonefile.nix @@ -8,7 +8,6 @@ let concatStringsSep "\n\n" (filter isString (split '' - +'' str)); joinLines = concatStringsSep "\n";