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

Revert "nixos: add option for bind to not resolve local queries (#29503)"

Browse Source 
This reverts commit 670b4e29adc16e0a29aa5b4c126703dcca56aeb6. The change
added in this commit was controversial when it was originally suggested
in https://github.com/NixOS/nixpkgs/pull/29205. Then that PR was closed
and a new one opened, https://github.com/NixOS/nixpkgs/pull/29503,
effectively circumventing the review process. I don't agree with this
modification. Adding an option 'resolveLocalQueries' to tell the locally
running name server that it should resolve local DNS queries feels
outright nuts. I agree that the current state is unsatisfactory and that
it should be improved, but this is not the right way.

(cherry picked from commit 23a021d12e8f939cd0bfddb1c7adeb125028c1e3)
This commit is contained in:
Peter Simons 2017-09-23 16:36:05 +02:00
parent 3a58e41e43
commit 99f759de1c
4 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/config/networking.nix
View File

@ -9,9 +9,7 @@ let
cfg = config.networking; cfg = config.networking;
dnsmasqResolve = config.services.dnsmasq.enable && dnsmasqResolve = config.services.dnsmasq.enable &&
config.services.dnsmasq.resolveLocalQueries; config.services.dnsmasq.resolveLocalQueries;
bindResolve = config.services.bind.enable && hasLocalResolver = config.services.bind.enable || dnsmasqResolve;
config.services.bind.resolveLocalQueries;
hasLocalResolver = bindResolve || dnsmasqResolve;
resolvconfOptions = cfg.resolvconfOptions resolvconfOptions = cfg.resolvconfOptions
++ optional cfg.dnsSingleRequest "single-request" ++ optional cfg.dnsSingleRequest "single-request"

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

@ -151,15 +151,6 @@ in
"; ";
}; };
resolveLocalQueries = mkOption {
type = types.bool;
default = true;
description = ''
Whether bind should resolve local queries (i.e. add 127.0.0.1 to
/etc/resolv.conf, overriding networking.nameserver).
'';
};
}; };
}; };

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

@ -42,7 +42,7 @@ in
default = true; default = true;
description = '' description = ''
Whether dnsmasq should resolve local queries (i.e. add 127.0.0.1 to Whether dnsmasq should resolve local queries (i.e. add 127.0.0.1 to
/etc/resolv.conf overriding networking.nameservers). /etc/resolv.conf).
''; '';
}; };

2
nixos/modules/tasks/network-interfaces-scripted.nix
View File

@ -105,7 +105,7 @@ let
'' ''
# Set the static DNS configuration, if given. # Set the static DNS configuration, if given.
${pkgs.openresolv}/sbin/resolvconf -m 1 -a static <<EOF ${pkgs.openresolv}/sbin/resolvconf -m 1 -a static <<EOF
${optionalString (cfg.domain != null) '' ${optionalString (cfg.nameservers != [] && cfg.domain != null) ''
domain ${cfg.domain} domain ${cfg.domain}
''} ''}
${optionalString (cfg.search != []) ("search " + concatStringsSep " " cfg.search)} ${optionalString (cfg.search != []) ("search " + concatStringsSep " " cfg.search)}