X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fresolv%2Ftemplates%2Fresolv.conf.erb;h=6f70f489f52605fb87a70a722aff93e00f07d22c;hb=946a95b2879d19c72c8b78f5fce685f91d01ecbb;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..6f70f489f 100644
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -3,39 +3,24 @@
 ### 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)
-  nameservers << "127.0.0.1"
-end
-
-nameservers += hosterinfo['nameservers'] if hosterinfo['nameservers']
-searchpaths += hosterinfo['searchpaths'] if hosterinfo['searchpaths']
-options += hosterinfo['resolvoptions'] if hosterinfo['resolvoptions']
-
-searchpaths << "debian.org"
+<%
+nameservers = @nameservers
 
 if nameservers.empty?
-  raise Puppet::ParseError, "Something has gone wrong writing resolv.conf: probably included for wrong hoster"
+  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  = ''
-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
-end
+<% if @searchpaths.size() > 0 %>
+search <%= @searchpaths.join(" ") %> debian.org
+<% end -%>
 
-options.each do |opt|
-  resolvconf += "options " + opt + "\n"
-end
+<%= nameservers.map{ |ns| "nameserver #{ns}"}.join("\n") %>
 
-resolvconf
-%>
+<% if @resolvoptions.size() > 0 %>
+options <%= @searchpaths.join(" ") %>
+<% end -%>