X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fresolv%2Ftemplates%2Fresolv.conf.erb;h=a36665fa665a6fa098170925db63b6ebeb3623b2;hb=ae44d955fa429cbfbec37b612b7fa57a3ef6a784;hp=f4257666e32a6e904f4572185fe6c491d2f187b6;hpb=69c19f570b0c7668d1374600a5a7cedaa81fbe2d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index f4257666e..a36665fa6 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 samosa}.include?(hostname)
+if %w{draghi liszt widor spohr}.include?(hostname)
   nameservers << "127.0.0.1"
 end
 
@@ -18,16 +18,19 @@ options += nodeinfo['hoster']['resolvoptions'] if nodeinfo['hoster']['resolvopti
 
 searchpaths << "debian.org"
 
-if nameservers.empty?
-  raise Puppet::ParseError, "Something has gone wrong writing resolv.conf: probably included for wrong hoster"
-end
-
 resolvconf  = ''
 resolvconf += "search " + searchpaths.join(" ") + "\n"
 
-if runs_local_resolver
+if defined?(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!"
+    #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|
     resolvconf += "nameserver " + ns + "\n"
   end