public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #121172 from eyJhb/bind-list-to-attrs

Browse Source 
nixos/bind: refactor zones from a list to attrset
This commit is contained in:
Silvan Mosberger 2021-05-03 21:21:22 +02:00 committed by GitHub
commit a221e6c330
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nixos/modules/services/networking/bind.nix
View File

@ -8,9 +8,13 @@ let
bindUser = "named"; bindUser = "named";
bindZoneOptions = { bindZoneCoerce = list: builtins.listToAttrs (lib.forEach list (zone: { name = zone.name; value = zone; }));
bindZoneOptions = { name, config, ... }: {
options = {
name = mkOption { name = mkOption {
type = types.str; type = types.str;
default = name;
description = "Name of the zone."; description = "Name of the zone.";
}; };
master = mkOption { master = mkOption {
@ -36,6 +40,7 @@ let
default = ""; default = "";
}; };
}; };
};
confFile = pkgs.writeText "named.conf" confFile = pkgs.writeText "named.conf"
'' ''
@ -84,7 +89,7 @@ let
${extraConfig} ${extraConfig}
}; };
'') '')
cfg.zones } (attrValues cfg.zones) }
''; '';
in in
@ -153,18 +158,19 @@ in
zones = mkOption { zones = mkOption {
default = []; default = [];
type = types.listOf (types.submodule [ { options = bindZoneOptions; } ]); type = with types; coercedTo (listOf attrs) bindZoneCoerce (attrsOf (types.submodule bindZoneOptions));
description = " description = "
List of zones we claim authority over. List of zones we claim authority over.
"; ";
example = [{ example = {
name = "example.com"; "example.com" = {
master = false; master = false;
file = "/var/dns/example.com"; file = "/var/dns/example.com";
masters = ["192.168.0.1"]; masters = ["192.168.0.1"];
slaves = []; slaves = [];
extraConfig = ""; extraConfig = "";
}]; };
};
}; };
extraConfig = mkOption { extraConfig = mkOption {