move dns info for ubc to hosters.yaml

diff --git a/modules/debian-org/misc/hoster.yaml b/modules/debian-org/misc/hoster.yaml
index e4ad017a2d874f87b6a53576e3ce573625a911b6..c241ebdadaa86d103258dd485b80438d778aecc0 100644 (file)
--- a/modules/debian-org/misc/hoster.yaml
+++ b/modules/debian-org/misc/hoster.yaml
@@ -95,6 +95,8 @@ ubcece:
   netrange:
     - 137.82.84.64/27
     - 206.12.19.0/24
+  searchpaths: [debprivate-ubc.debian.org]
+  nameservers: [206.12.19.5, 137.82.1.1, 142.103.1.1]
 ugent:
   netrange:
     - 157.193.0.0/16

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index e5ddafe046b2d8d61f80bf4a8798d2b5cdb732b1..8c0166b05923704c10077a57435bde37be5b9651 100644 (file)
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -34,11 +34,11 @@ case hosterinfo["name"]
     searchpaths << "debprivate-grnet.debian.org"
   when "osousl" then
     nameserver += ["140.211.166.130","140.211.166.131"]
-  when "ubcece" then
-    nameservers += ["206.12.19.5", "137.82.1.1", "142.103.1.1" ]
-    searchpaths << "debprivate-ubc.debian.org"
 end
 
+nameservers += hosterinfo['nameservers'] if hosterinfo['nameservers']
+searchpaths += hosterinfo['searchpaths'] if hosterinfo['searchpaths']
+
 searchpaths << "debian.org"
 
 if nameservers.empty?