X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fresolv%2Ftemplates%2Fresolv.conf.erb;h=2e1968b639785d625a38b1cd0e45ffbf58e5ad7d;hb=16e295d6dcd715d959e2fad2cf0e25ba2938058e;hp=4f7cd63da7937e41a8ce778a34f8325a274aedc8;hpb=1793966c957b29380dd706130182e46f48122b5e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index 4f7cd63da..2e1968b63 100644
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -6,24 +6,38 @@
 <%=
 nameservers = []
 searchpaths = []
+options     = []
 resolvconf  = ''
 
-if %w{draghi liszt widor spohr samosa}.include?(hostname)
+if %w{draghi}.include?(hostname)
   nameservers << "127.0.0.1"
 end
 
-nameservers += hosterinfo['nameservers'] if hosterinfo['nameservers']
-searchpaths += hosterinfo['searchpaths'] if hosterinfo['searchpaths']
+nameservers += scope.lookupvar('ns')
+searchpaths += scope.lookupvar('sp')
+options     += scope.lookupvar('opts')
 
 searchpaths << "debian.org"
 
-if nameservers.empty?
-  raise Puppet::ParseError, "Something has gone wrong writing resolv.conf: probably included for wrong hoster"
+resolvconf += "search " + searchpaths.to_a.flatten.join(" ") + "\n"
+
+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!"])
+    nameservers << '8.8.8.8'
+    nameservers << '8.8.4.4'
+  end
+
+  nameservers.to_a.flatten.each do |ns|
+    resolvconf += "nameserver " + ns + "\n"
+  end
 end
 
-resolvconf += "search " + searchpaths.join(" ") + "\n"
-nameservers.each do |ns|
-  resolvconf += "nameserver " + ns + "\n"
+options.to_a.flatten.each do |opt|
+  resolvconf += "options " + opt + "\n"
 end
 
 resolvconf