move dns info for osuosl and grnet to hosters.yaml

diff --git a/modules/debian-org/misc/hoster.yaml b/modules/debian-org/misc/hoster.yaml
index c241ebdadaa86d103258dd485b80438d778aecc0..c4e59ed84e102dfad41f35f854c20efdef106b52 100644 (file)
--- a/modules/debian-org/misc/hoster.yaml
+++ b/modules/debian-org/misc/hoster.yaml
@@ -57,6 +57,8 @@ grnet:
   netrange:
     - 194.177.211.192/27
     - 2001:648:2ffc:deb::/64
+  searchpaths: [debprivate-grnet.debian.org]
+  nameservers: [194.177.210.10, 194.177.210.210]
 helsinki:
   netrange:
     - 193.167.160.0/23
@@ -67,10 +69,11 @@ isc:
 nmmn:
   netrange:
     - 217.114.76.80/29
-osousl:
+osuosl:
   netrange:
     - 140.211.166.0/25
     - 140.211.15.0/24
+  nameservers: [140.211.166.130, 140.211.166.131, 216.165.191.54]
 sanger:
   netrange:
     - 193.62.202.24/29

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index 8c0166b05923704c10077a57435bde37be5b9651..fb0288e5f1ec0a63c5b4adfc88c7f8fb9dc747b9 100644 (file)
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -29,11 +29,6 @@ case hosterinfo["name"]
     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 "osousl" then
-    nameserver += ["140.211.166.130","140.211.166.131"]
 end
 
 nameservers += hosterinfo['nameservers'] if hosterinfo['nameservers']