WIP upgrade

[perso/Immae/Config/Nix.git] / modules / private / dns.nix

diff --git a/modules/private/dns.nix b/modules/private/dns.nix
index 120c46c3d020faa052045ef26755564a98524b90..81cf25ec2085e768323cde1d6a7fbb755727e316 100644 (file)
--- a/modules/private/dns.nix
+++ b/modules/private/dns.nix
@@ -48,7 +48,7 @@
       ${cfg.extraConfig}
 
       ${ lib.concatMapStrings
-          ({ name, file, master ? true, extra ? "", slaves ? [], masters ? [] }:
+          ({ name, file, master ? true, extraConfig ? "", slaves ? [], masters ? [] }:
             ''
               zone "${name}" {
                 type ${if master then "master" else "slave"};
@@ -66,10 +66,10 @@
                     };
                   '' else ""}
                 allow-query { any; };
-                ${extra}
+                ${extraConfig}
               };
             '')
-          cfg.zones }
+          (builtins.attrValues cfg.zones) }
     '';
     mxes = lib.attrsets.filterAttrs
       (n: v: v.mx.enable)
@@ -124,11 +124,13 @@
           masters = if lib.attrsets.hasAttr "masters" conf
             then lib.lists.flatten (map (n: lib.attrsets.attrValues ns.${n}) conf.masters)
             else [];
+          slaves = [];
         }) slaveZones)
         ++ (map (conf: {
           name = conf.name;
           master = true;
-          extra = if lib.attrsets.hasAttr "extra" conf then conf.extra else "";
+          extraConfig = if lib.attrsets.hasAttr "extra" conf then conf.extra else "";
+          masters = [];
           slaves = if lib.attrsets.hasAttr "slaves" conf
             then lib.lists.flatten (map (n: lib.attrsets.attrValues ns.${n}) conf.slaves)
             else [];