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 5c120ba834a51aed424d459b350decb704c62447..fb0288e5f1ec0a63c5b4adfc88c7f8fb9dc747b9 100644 (file)
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -8,7 +8,7 @@ nameservers = []
 searchpaths = []
 resolvconf  = ''
 
-case hoster
+case hosterinfo["name"]
   when "darmstadt" then
     case hostname
       when "draghi", "liszt" then
@@ -16,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
@@ -23,14 +29,11 @@ case hoster
     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 "ubcece" then
-    searchpaths << "debprivate-ubc.debian.org"
-    nameservers += ["206.12.19.5", "137.82.1.1", "142.103.1.1" ]
 end
 
+nameservers += hosterinfo['nameservers'] if hosterinfo['nameservers']
+searchpaths += hosterinfo['searchpaths'] if hosterinfo['searchpaths']
+
 searchpaths << "debian.org"
 
 if nameservers.empty?