I wonder if this is better

[dsa-puppet.git] / modules / resolv / templates / resolv.conf.erb

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index f4257666e32a6e904f4572185fe6c491d2f187b6..0ebef6c5b81e678a826f09b9332339726219d12e 100644 (file)
--- 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,17 @@ 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
+unbound = lookupvar('unbound')
+if 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!"
+  end
+
   nameservers.each do |ns|
     resolvconf += "nameserver " + ns + "\n"
   end