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

Merge pull request #72987 from rnhmjoj/dnschain

Browse Source 
nixos/dnschain: use forwardZonesRecurse in pdns-recursor
This commit is contained in:
Renaud 2019-11-29 19:56:21 +01:00 committed by GitHub
commit e37e7b413c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/networking/dnschain.nix
View File

@ -137,7 +137,7 @@ in
]; ];
services.pdns-recursor = mkIf cfgs.pdns-recursor.resolveDNSChainQueries { services.pdns-recursor = mkIf cfgs.pdns-recursor.resolveDNSChainQueries {
forwardZones = forwardZonesRecurse =
{ bit = "127.0.0.1:${toString cfg.dns.port}"; { bit = "127.0.0.1:${toString cfg.dns.port}";
dns = "127.0.0.1:${toString cfg.dns.port}"; dns = "127.0.0.1:${toString cfg.dns.port}";
}; };

11
nixos/modules/services/networking/pdns-recursor.nix
View File

@ -90,11 +90,19 @@ in {
}; };
forwardZones = mkOption { forwardZones = mkOption {
type = types.attrs;
default = {};
description = ''
DNS zones to be forwarded to other authoritative servers.
'';
};
forwardZonesRecurse = mkOption {
type = types.attrs; type = types.attrs;
example = { eth = "127.0.0.1:5353"; }; example = { eth = "127.0.0.1:5353"; };
default = {}; default = {};
description = '' description = ''
DNS zones to be forwarded to other servers. DNS zones to be forwarded to other recursive servers.
''; '';
}; };
@ -159,6 +167,7 @@ in {
webserver-allow-from = cfg.api.allowFrom; webserver-allow-from = cfg.api.allowFrom;
forward-zones = mapAttrsToList (zone: uri: "${zone}.=${uri}") cfg.forwardZones; forward-zones = mapAttrsToList (zone: uri: "${zone}.=${uri}") cfg.forwardZones;
forward-zones-recurse = mapAttrsToList (zone: uri: "${zone}.=${uri}") cfg.forwardZonesRecurse;
export-etc-hosts = cfg.exportHosts; export-etc-hosts = cfg.exportHosts;
dnssec = cfg.dnssecValidation; dnssec = cfg.dnssecValidation;
serve-rfc1918 = cfg.serveRFC1918; serve-rfc1918 = cfg.serveRFC1918;