X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fresolv%2Ftemplates%2Fresolv.conf.erb;h=7733374208b43baf9c92412ef23613f1e6bf3f01;hb=2f4f1c9a616b4b92a598440958121d4a7e83356c;hp=8c0166b05923704c10077a57435bde37be5b9651;hpb=170732f28635980fe2f70f868db4a9c778834f30;p=mirror%2Fdsa-puppet.git

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index 8c0166b05..773337420 100644
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -3,52 +3,35 @@
 ### USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ###
 
-<%=
-nameservers = []
+<%
 searchpaths = []
-resolvconf  = ''
-
-case hosterinfo["name"]
-  when "darmstadt" then
-    case hostname
-      when "draghi", "liszt" then
-        nameservers << "127.0.0.1"
-    end
-    nameservers += ["82.195.75.81", "82.195.66.249", "217.198.242.225"]
-    searchpaths << "debprivate-darmstadt.debian.org"
-  when "dgi" then
-    case hostname
-      when "widor" then
-         nameserver << "127.0.0.1"
-    end
-    nameservers += ["195.49.152.215", "195.49.152.213", "195.49.152.214"]
-  when "ftcollins" then
-    case hostname
-      when "spohr", "samosa" then
-        nameservers << "127.0.0.1"
-    end
-    nameservers += ["192.25.206.33", "192.25.206.57"]
-    searchpaths << "debprivate-ftcollins.debian.org"
-  when "grnet" then
-    nameservers += ["194.177.210.10", "194.177.210.210"]
-    searchpaths << "debprivate-grnet.debian.org"
-  when "osousl" then
-    nameserver += ["140.211.166.130","140.211.166.131"]
+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 += hosterinfo['nameservers'] if hosterinfo['nameservers']
-searchpaths += hosterinfo['searchpaths'] if hosterinfo['searchpaths']
-
-searchpaths << "debian.org"
-
-if nameservers.empty?
-  raise Puppet::ParseError, "Something has gone wrong writing resolv.conf: probably included for wrong hoster"
+if @unbound
+  nameservers = ['127.0.0.1']
 end
 
-resolvconf += "search " + searchpaths.join(" ") + "\n"
-nameservers.each do |ns|
-  resolvconf += "nameserver " + ns + "\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 -%>