And manda, dgi and ftc

[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 eb59db861f7c98072bdabdc8fe176dd7959aed11..4f7cd63da7937e41a8ce778a34f8325a274aedc8 100644 (file)
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -8,26 +8,13 @@ nameservers = []
 searchpaths = []
 resolvconf  = ''
 
-case hoster
-  when "ubcece" then
-    searchpaths << "debprivate-ubc.debian.org"
-    nameservers += ["206.12.19.5", "137.82.1.1", "142.103.1.1" ]
-  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 "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"
+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']
+
 searchpaths << "debian.org"
 
 if nameservers.empty?