X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fresolv%2Ftemplates%2Fresolv.conf.erb;h=dc2babed917ba71a2992f86e6cf705373e9429bb;hb=f7e0f993132d508cee94cf091f953ceefaf13c9c;hp=4e9f7650c588e0c184acbea08ad07c1cc2258f2d;hpb=2e8e944225660df69ce7767e9374995c35c4d748;p=mirror%2Fdsa-puppet.git

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index 4e9f7650c..dc2babed9 100644
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -3,39 +3,35 @@
 ### USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ###
 
-<%=
-nameservers = []
+<%
 searchpaths = []
-options = []
-
-if %w{draghi liszt widor spohr samosa}.include?(hostname)
+searchpaths += @sp
+searchpaths << "debian.org" -%>
+search <%= searchpaths.to_a.flatten.join(" ") %>
+<%
+nameservers = []
+if %w{draghi}.include?(hostname)
   nameservers << "127.0.0.1"
 end
+nameservers += @ns
 
-nameservers += hosterinfo['nameservers'] if hosterinfo['nameservers']
-searchpaths += hosterinfo['searchpaths'] if hosterinfo['searchpaths']
-options += hosterinfo['resolvoptions'] if hosterinfo['resolvoptions']
-
-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
-  resolvconf += "nameserver 127.0.0.1\n"
-else
-  nameservers.each do |ns|
-    resolvconf += "nameserver " + ns + "\n"
-  end
+if @unbound && @unbound == "true"
+  nameservers = ['127.0.0.1']
 end
 
-options.each do |opt|
-  resolvconf += "options " + opt + "\n"
+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
 
-resolvconf
-%>
+nameservers.to_a.flatten.each do |nms| -%>
+nameserver <%= nms %>
+<% end -%>
+<%
+options  = []
+options += @opts -%>
+<% options.to_a.flatten.each do |opt| -%>
+options <%= opt %>
+<% end -%>