X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fresolv%2Ftemplates%2Fresolv.conf.erb;h=9d4e8f86bee5f5f96b10bd337f78bf1e9022ad0e;hb=33a685862291e6f3c0c7f9df702b930430bbe419;hp=7733374208b43baf9c92412ef23613f1e6bf3f01;hpb=b529b139a60ea8355089511737c8264185d8d074;p=mirror%2Fdsa-puppet.git

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index 773337420..9d4e8f86b 100644
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -3,35 +3,24 @@
 ### USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ###
 
-<%
-searchpaths = []
-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
 
-if @unbound
-  nameservers = ['127.0.0.1']
-end
+<%
+nameservers = @ns
 
 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 |nms| -%>
-nameserver <%= nms %>
+%>
+
+<% if @searchpaths.size() > 0 %>
+search <%= @searchpaths.join(" ") %>
 <% end -%>
-<%
-options  = []
-options += @opts -%>
-<% options.to_a.flatten.each do |opt| -%>
-options <%= opt %>
+
+<%= nameservers.map{ |ns| "nameserver #{ns}"}.join("\n") %>
+
+<% if @resolvoptions.size() > 0 %>
+options <%= @searchpaths.join(" ") %>
 <% end -%>