X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fresolv%2Ftemplates%2Fresolv.conf.erb;h=6e02dbb8e7ae576d79c0181612af811e26ba85f7;hb=4e40e8078da4683fa24ee265c5dfb6faf8bc655a;hp=dfea77861363010f866fdcb82455bddd1b7aea6d;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index dfea77861..6e02dbb8e 100644
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -3,42 +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}.include?(hostname)
-  nameservers << "127.0.0.1"
-end
-
-nameservers += scope.lookupvar('site::nodeinfo')['hoster']['nameservers'] if scope.lookupvar('site::nodeinfo')['hoster']['nameservers']
-searchpaths += scope.lookupvar('site::nodeinfo')['hoster']['searchpaths'] if scope.lookupvar('site::nodeinfo')['hoster']['searchpaths']
-options += scope.lookupvar('site::nodeinfo')['hoster']['resolvoptions'] if scope.lookupvar('site::nodeinfo')['hoster']['resolvoptions']
+<%
+nameservers = @nameservers
 
-searchpaths << "debian.org"
-
-resolvconf  = ''
-resolvconf += "search " + searchpaths.join(" ") + "\n"
+if nameservers.empty?
+  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
 
-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.each do |ns|
-    resolvconf += "nameserver " + ns + "\n"
-  end
-end
+<% if @searchpaths.size() > 0 %>
+search <%= @searchpaths.join(" ") %>
+<% 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 -%>