summary refs log tree commit diff
path: root/nixos/modules/services/networking/bind.nix
diff options
context:
space:
mode:
authorgwitmond <guido@witmond.nl>2017-09-18 13:21:44 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2017-09-18 22:54:29 +0200
commitbd52618c9d4a2620882cd03ecb15a1eb028827b7 (patch)
treefdf0e98cdeecd77a1839b4abd3594d410e6e19b6 /nixos/modules/services/networking/bind.nix
parent38c14d71329c3fa760ea602f09b380b3cd0bdbc2 (diff)
downloadnixpkgs-bd52618c9d4a2620882cd03ecb15a1eb028827b7.tar
nixpkgs-bd52618c9d4a2620882cd03ecb15a1eb028827b7.tar.gz
nixpkgs-bd52618c9d4a2620882cd03ecb15a1eb028827b7.tar.bz2
nixpkgs-bd52618c9d4a2620882cd03ecb15a1eb028827b7.tar.lz
nixpkgs-bd52618c9d4a2620882cd03ecb15a1eb028827b7.tar.xz
nixpkgs-bd52618c9d4a2620882cd03ecb15a1eb028827b7.tar.zst
nixpkgs-bd52618c9d4a2620882cd03ecb15a1eb028827b7.zip
nixos: add option for bind to not resolve local queries (#29503)
When the user specifies the networking.nameservers setting in the
configuration file, it must take precedence over automatically
derived settings.

The culprit was services.bind that made the resolver set to
127.0.0.1 and ignore the nameserver setting.

This patch adds a flag to services.bind to override the nameserver
to localhost. It defaults to true. Setting this to false prevents the
service.bind and dnsmasq.resolveLocalQueries settings from
overriding the users' settings.

Also, when the user specifies a domain to search, it must be set in
the resolver configuration, even if the user does not specify any
nameservers.

(cherry picked from commit 670b4e29adc16e0a29aa5b4c126703dcca56aeb6)

This commit was accidentally merged to 17.09 but was intended for
master. This is the cherry-pick to master.
Diffstat (limited to 'nixos/modules/services/networking/bind.nix')
-rw-r--r--nixos/modules/services/networking/bind.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix
index 763283dfe7a..9f533eedf6e 100644
--- a/nixos/modules/services/networking/bind.nix
+++ b/nixos/modules/services/networking/bind.nix
@@ -151,6 +151,15 @@ 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).
+        '';
+      };
+
     };
 
   };