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

Merge pull request #129934 from mattchrist/nixos/bind-package

Browse Source 
nixos/bind: allow specifying BIND package
This commit is contained in:
Robert Hensing 2021-07-12 15:21:15 +02:00 committed by GitHub
commit c05cc13f76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,8 @@ let
cfg = config.services.bind; cfg = config.services.bind;
bindPkg = config.services.bind.package;
bindUser = "named"; bindUser = "named";
bindZoneCoerce = list: builtins.listToAttrs (lib.forEach list (zone: { name = zone.name; value = zone; })); bindZoneCoerce = list: builtins.listToAttrs (lib.forEach list (zone: { name = zone.name; value = zone; }));
@ -104,6 +106,14 @@ in
enable = mkEnableOption "BIND domain name server"; enable = mkEnableOption "BIND domain name server";
package = mkOption {
type = types.package;
default = pkgs.bind;
defaultText = "pkgs.bind";
description = "The BIND package to use.";
};
cacheNetworks = mkOption { cacheNetworks = mkOption {
default = [ "127.0.0.0/24" ]; default = [ "127.0.0.0/24" ];
type = types.listOf types.str; type = types.listOf types.str;
@ -225,7 +235,7 @@ in
preStart = '' preStart = ''
mkdir -m 0755 -p /etc/bind mkdir -m 0755 -p /etc/bind
if ! [ -f "/etc/bind/rndc.key" ]; then if ! [ -f "/etc/bind/rndc.key" ]; then
${pkgs.bind.out}/sbin/rndc-confgen -c /etc/bind/rndc.key -u ${bindUser} -a -A hmac-sha256 2>/dev/null ${bindPkg.out}/sbin/rndc-confgen -c /etc/bind/rndc.key -u ${bindUser} -a -A hmac-sha256 2>/dev/null
fi fi
${pkgs.coreutils}/bin/mkdir -p /run/named ${pkgs.coreutils}/bin/mkdir -p /run/named
@ -233,9 +243,9 @@ in
''; '';
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.bind.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f"; ExecStart = "${bindPkg.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
ExecReload = "${pkgs.bind.out}/sbin/rndc -k '/etc/bind/rndc.key' reload"; ExecReload = "${bindPkg.out}/sbin/rndc -k '/etc/bind/rndc.key' reload";
ExecStop = "${pkgs.bind.out}/sbin/rndc -k '/etc/bind/rndc.key' stop"; ExecStop = "${bindPkg.out}/sbin/rndc -k '/etc/bind/rndc.key' stop";
}; };
unitConfig.Documentation = "man:named(8)"; unitConfig.Documentation = "man:named(8)";