move dns info for osuosl and grnet to hosters.yaml

[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..fb0288e5f1ec0a63c5b4adfc88c7f8fb9dc747b9 100644 (file)
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -8,10 +8,7 @@ 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" ]
+case hosterinfo["name"]
   when "darmstadt" then
     case hostname
       when "draghi", "liszt" then
@@ -19,6 +16,12 @@ case hoster
     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
@@ -28,6 +31,9 @@ case hoster
     searchpaths << "debprivate-ftcollins.debian.org"
 end
 
+nameservers += hosterinfo['nameservers'] if hosterinfo['nameservers']
+searchpaths += hosterinfo['searchpaths'] if hosterinfo['searchpaths']
+
 searchpaths << "debian.org"
 
 if nameservers.empty?