And manda, dgi and ftc

diff --git a/modules/debian-org/misc/hoster.yaml b/modules/debian-org/misc/hoster.yaml
index c4e59ed84e102dfad41f35f854c20efdef106b52..c21ac5ea9f869e371c9cf7237ed70cf6b43fb35a 100644 (file)
--- a/modules/debian-org/misc/hoster.yaml
+++ b/modules/debian-org/misc/hoster.yaml
@@ -44,15 +44,20 @@ darmstadt:
     - 82.195.75.64/26
     - 82.195.75.32/28
     - 2001:41b8:202:deb::/64
+  searchpaths: [debprivate-darmstadt.debian.org]
+  nameservers: [82.195.75.81, 82.195.66.249, 217.198.242.225]
 dgi:
   netrange:
     - 93.94.130.128/26
+  nameservers: [195.49.152.215, 195.49.152.213, 195.49.152.214]
 freenet:
   netrange:
     - 62.104.0.0/16
 ftcollins:
   netrange:
     - 192.25.206.0/24
+  searchpaths: [debprivate-debprivate-ftcollins.debian.org]
+  nameservers: [192.25.206.33, 192.25.206.57]
 grnet:
   netrange:
     - 194.177.211.192/27

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index fb0288e5f1ec0a63c5b4adfc88c7f8fb9dc747b9..4f7cd63da7937e41a8ce778a34f8325a274aedc8 100644 (file)
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -8,27 +8,8 @@ nameservers = []
 searchpaths = []
 resolvconf  = ''
 
-case hosterinfo["name"]
-  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 "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
-        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']