X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fresolv%2Ftemplates%2Fresolv.conf.erb;h=531b516593fddf284f08eaac38d19fc31891fd34;hb=9eb49205d5b9f3046a885fa1e219288c509fe970;hp=67f8d64a5462e0ac376f4fceaf9d93c1019843e9;hpb=d4f6ae4b33cd6f3d05a891bbea1310a838e9b9e3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index 67f8d64a5..531b51659 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}.include?(hostname)
   nameservers << "127.0.0.1"
 end
 
@@ -21,12 +21,12 @@ searchpaths << "debian.org"
 resolvconf  = ''
 resolvconf += "search " + searchpaths.join(" ") + "\n"
 
-if defined?(unbound) and unbound and unbound == "true"
+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!"
-    scope.function_warning("Something has gone wrong writing resolv.conf.  No nameservers to use - using google's!")
+    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