]> git.donarmstrong.com Git - dsa-puppet.git/blobdiff - modules/resolv/templates/resolv.conf.erb
stderr is dev/null. maybe this will do?
[dsa-puppet.git] / modules / resolv / templates / resolv.conf.erb
index 0ebef6c5b81e678a826f09b9332339726219d12e..e3956756fc1b625728d465b8e1753289760cd7da 100644 (file)
@@ -21,12 +21,14 @@ searchpaths << "debian.org"
 resolvconf  = ''
 resolvconf += "search " + searchpaths.join(" ") + "\n"
 
-unbound = lookupvar('unbound')
-if unbound and unbound == "true"
+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!"
+    #raise Puppet::ParseError, "Something has gone wrong writing resolv.conf.  No nameservers to use!"
+    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|