X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fresolv%2Ftemplates%2Fresolv.conf.erb;h=4e9f7650c588e0c184acbea08ad07c1cc2258f2d;hb=2e8e944225660df69ce7767e9374995c35c4d748;hp=99d8c0a64bc27e91b49c32e03eb87fea78110da8;hpb=456ead492354e307ef726c0b8fed4339fa931448;p=dsa-puppet.git

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index 99d8c0a6..4e9f7650 100644
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -24,9 +24,15 @@ end
 
 resolvconf  = ''
 resolvconf += "search " + searchpaths.join(" ") + "\n"
-nameservers.each do |ns|
-  resolvconf += "nameserver " + ns + "\n"
+
+if runs_local_resolver
+  resolvconf += "nameserver 127.0.0.1\n"
+else
+  nameservers.each do |ns|
+    resolvconf += "nameserver " + ns + "\n"
+  end
 end
+
 options.each do |opt|
   resolvconf += "options " + opt + "\n"
 end