X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fresolv%2Ftemplates%2Fresolv.conf.erb;h=7733374208b43baf9c92412ef23613f1e6bf3f01;hb=ec3b198843651d078ae4505413daeb5cf5cc1d18;hp=34ea6af0a955d6cc2e2175966fadccb9473f5015;hpb=466e17dc9866909aca0a4ccddb1c605be8135013;p=mirror%2Fdsa-puppet.git

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index 34ea6af0a..773337420 100644
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -3,42 +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}.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 += scope.lookupvar('ns')
-options += scope.lookupvar('site::nodeinfo')['hoster']['resolvoptions'] if scope.lookupvar('site::nodeinfo')['hoster']['resolvoptions']
-
-searchpaths << "debian.org"
-searchpaths += scope.lookupvar('sp')
-
-resolvconf  = ''
-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
+if @unbound
+  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 -%>