From a45fb3c48445680d4cf564dc89eaf1f78445f9d0 Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 5 May 2021 23:20:39 +0200 Subject: [PATCH] nixos-module/container/dnscache: use data from config.site.dns.localZones --- nix/nixos-module/container/dnscache.nix | 39 +++++-------------------- 1 file changed, 8 insertions(+), 31 deletions(-) diff --git a/nix/nixos-module/container/dnscache.nix b/nix/nixos-module/container/dnscache.nix index 5dcc932..5f386d2 100644 --- a/nix/nixos-module/container/dnscache.nix +++ b/nix/nixos-module/container/dnscache.nix @@ -73,37 +73,14 @@ lib.mkIf config.site.hosts.${hostName}.services.dnscache.enable { # Local networks - forward-zone: - name: "zentralwerk.dn42" - forward-host: "dns.serv.zentralwerk.org" - - forward-zone: - name: "72.20.172.in-addr.arpa" - forward-host: "dns.serv.zentralwerk.org" - - forward-zone: - name: "73.20.172.in-addr.arpa" - forward-host: "dns.serv.zentralwerk.org" - - forward-zone: - name: "74.20.172.in-addr.arpa" - forward-host: "dns.serv.zentralwerk.org" - - forward-zone: - name: "75.20.172.in-addr.arpa" - forward-host: "dns.serv.zentralwerk.org" - - forward-zone: - name: "76.20.172.in-addr.arpa" - forward-host: "dns.serv.zentralwerk.org" - - forward-zone: - name: "77.20.172.in-addr.arpa" - forward-host: "dns.serv.zentralwerk.org" - - forward-zone: - name: "0.0.5.0.2.d.3.c.4.2.0.0.3.2.d.f.ip6.arpa" - forward-host: "dns.serv.zentralwerk.org" + ${lib.concatMapStrings ({ name, ... }: '' + forward-zone: + name: "${name}" + forward-host: "${config.site.net.serv.hosts4.dns}" + ${lib.concatMapStrings (hosts6: + " forward-host: ${hosts6.dns}\n" + ) (builtins.attrValues config.site.net.serv.hosts6)} + '') config.site.dns.localZones} # C3D2 reverse