Fix resolv.conf.erb to work with no nameservers when we have a local recursor

[dsa-puppet.git] / modules / resolv / templates / resolv.conf.erb

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index e8873c88f382f6c095ddc64ddaff80d7fbfe4a50..9bc11ba9664e90a63b189e5d328aad840e14ce15 100644 (file)
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -3,15 +3,39 @@
 ### USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ###
 
-<%= 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
-"
+<%=
+nameservers = []
+searchpaths = []
+options = []
+
+if %w{draghi liszt widor spohr}.include?(hostname)
+  nameservers << "127.0.0.1"
 end
-if resolvconf == ""
-  raise Puppet::ParseError, "resolv.conf is empty"
+
+nameservers += nodeinfo['hoster']['nameservers'] if nodeinfo['hoster']['nameservers']
+searchpaths += nodeinfo['hoster']['searchpaths'] if nodeinfo['hoster']['searchpaths']
+options += nodeinfo['hoster']['resolvoptions'] if nodeinfo['hoster']['resolvoptions']
+
+searchpaths << "debian.org"
+
+resolvconf  = ''
+resolvconf += "search " + searchpaths.join(" ") + "\n"
+
+if runs_local_resolver
+  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!"
+  end
+
+  nameservers.each do |ns|
+    resolvconf += "nameserver " + ns + "\n"
+  end
+end
+
+options.each do |opt|
+  resolvconf += "options " + opt + "\n"
 end
+
 resolvconf
 %>