about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorSilvan Mosberger <infinisil@icloud.com>2018-07-24 22:53:53 +0200
committerGitHub <noreply@github.com>2018-07-24 22:53:53 +0200
commit7eb5ba7618e047f0eddc4441fd599dbe2e9e2bbd (patch)
tree66155a47b77164aac84752bc5010f39b4a1bef57 /nixos
parent2baf02035c38ed191fb69fab28e6b7e9230de37f (diff)
parent81fa1ceeee3b21e1d20e40f924a05fc1bb58e16c (diff)
Merge pull request #44015 from alexshpilkin/resolv-unbound
nixos/networking: include local Unbound in resolv.conf
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/config/networking.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 48c3b41bc0911..1ef5313d3fdd5 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -9,7 +9,9 @@ let
   cfg = config.networking;
   dnsmasqResolve = config.services.dnsmasq.enable &&
                    config.services.dnsmasq.resolveLocalQueries;
-  hasLocalResolver = config.services.bind.enable || dnsmasqResolve;
+  hasLocalResolver = config.services.bind.enable ||
+                     config.services.unbound.enable ||
+                     dnsmasqResolve;
 
   resolvconfOptions = cfg.resolvconfOptions
     ++ optional cfg.dnsSingleRequest "single-request"