X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fresolv%2Ftemplates%2Fresolv.conf.erb;h=4e9f7650c588e0c184acbea08ad07c1cc2258f2d;hb=2e8e944225660df69ce7767e9374995c35c4d748;hp=e8873c88f382f6c095ddc64ddaff80d7fbfe4a50;hpb=be6f9a8aa7f4bc626fd97883de5ec06d0e5b7e65;p=dsa-puppet.git

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index e8873c88..4e9f7650 100644
--- 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 samosa}.include?(hostname)
+  nameservers << "127.0.0.1"
+end
+
+nameservers += hosterinfo['nameservers'] if hosterinfo['nameservers']
+searchpaths += hosterinfo['searchpaths'] if hosterinfo['searchpaths']
+options += hosterinfo['resolvoptions'] if hosterinfo['resolvoptions']
+
+searchpaths << "debian.org"
+
+if nameservers.empty?
+  raise Puppet::ParseError, "Something has gone wrong writing resolv.conf: probably included for wrong hoster"
 end
-if resolvconf == ""
-  raise Puppet::ParseError, "resolv.conf is empty"
+
+resolvconf  = ''
+resolvconf += "search " + searchpaths.join(" ") + "\n"
+
+if runs_local_resolver
+  resolvconf += "nameserver 127.0.0.1\n"
+else
+  nameservers.each do |ns|
+    resolvconf += "nameserver " + ns + "\n"
+  end
 end
+
+options.each do |opt|
+  resolvconf += "options " + opt + "\n"
+end
+
 resolvconf
 %>