diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 5fa91ec9cfb..619f36cd515 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -9,9 +9,7 @@ let cfg = config.networking; dnsmasqResolve = config.services.dnsmasq.enable && config.services.dnsmasq.resolveLocalQueries; - bindResolve = config.services.bind.enable && - config.services.bind.resolveLocalQueries; - hasLocalResolver = bindResolve || dnsmasqResolve; + hasLocalResolver = config.services.bind.enable || dnsmasqResolve; resolvconfOptions = cfg.resolvconfOptions ++ optional cfg.dnsSingleRequest "single-request" diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index 9f533eedf6e..763283dfe7a 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -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). - ''; - }; - }; }; diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix index 3d1b931de07..fcf5aa5f175 100644 --- a/nixos/modules/services/networking/dnsmasq.nix +++ b/nixos/modules/services/networking/dnsmasq.nix @@ -42,7 +42,7 @@ in default = true; description = '' Whether dnsmasq should resolve local queries (i.e. add 127.0.0.1 to - /etc/resolv.conf overriding networking.nameservers). + /etc/resolv.conf). ''; }; diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index adc048f3ca2..7ede8752bcc 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -105,7 +105,7 @@ let '' # Set the static DNS configuration, if given. ${pkgs.openresolv}/sbin/resolvconf -m 1 -a static <