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

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index d287287b4..a42aa25d4 100644
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -1,12 +1,37 @@
-<%= resolvconf = case hoster
-    when "ubcece" then "search debprivate-ubc.debian.org debian.org
-nameserver 206.12.19.5
-nameserver 137.82.1.1
-nameserver 142.103.1.1
-"
+##
+### THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+### 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
-if resolvconf == ""
-  raise Puppet::ParseError, "resolv.conf is empty"
+nameservers += @ns
+
+if @unbound && @unbound == "true"
+  nameservers = ['127.0.0.1']
 end
-resolvconf
-%>
+
+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 %>
+<% end -%>
+<%
+options  = []
+options += @opts -%>
+<% options.to_a.flatten.each do |opt| -%>
+options <%= opt %>
+<% end -%>