X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fresolv%2Ftemplates%2Fresolv.conf.erb;h=993e7babcc4c69045cc4c2238a2b65e59ec2734f;hb=e2bba642eba71459f5e125d03d3229671e6bf0ab;hp=9bc11ba9664e90a63b189e5d328aad840e14ce15;hpb=a46da6bd7b246ce960c5bd1d484597b79c05521a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index 9bc11ba96..993e7babc 100644
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -8,7 +8,7 @@ nameservers = []
 searchpaths = []
 options = []
 
-if %w{draghi liszt widor spohr}.include?(hostname)
+if %w{draghi liszt spohr}.include?(hostname)
   nameservers << "127.0.0.1"
 end
 
@@ -21,11 +21,14 @@ searchpaths << "debian.org"
 resolvconf  = ''
 resolvconf += "search " + searchpaths.join(" ") + "\n"
 
-if runs_local_resolver
+if has_variable?('unbound') and unbound and unbound == "true"
   resolvconf += "nameserver 127.0.0.1\n"
 else
   if nameservers.empty?
-    raise Puppet::ParseError, "Something has gone wrong writing resolv.conf.  No nameservers to use!"
+    #raise Puppet::ParseError, "Something has gone wrong writing resolv.conf.  No nameservers to use!"
+    scope.function_warning(["Something has gone wrong writing resolv.conf.  No nameservers to use - using google's!"])
+    nameservers << '8.8.8.8'
+    nameservers << '8.8.4.4'
   end
 
   nameservers.each do |ns|