X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fresolv%2Ftemplates%2Fresolv.conf.erb;h=8c0166b05923704c10077a57435bde37be5b9651;hb=170732f28635980fe2f70f868db4a9c778834f30;hp=e5ddafe046b2d8d61f80bf4a8798d2b5cdb732b1;hpb=1a8949752e1ea5789d6a7b27e21d64de4299b36a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index e5ddafe04..8c0166b05 100644
--- 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?