X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fresolv%2Ftemplates%2Fresolv.conf.erb;h=5c120ba834a51aed424d459b350decb704c62447;hb=688eb0a4a460ac03ccf6857178b3cc51b32d4192;hp=2946517ae23b577eddd2a158bb2b716f50c0949e;hpb=0929043d28f0aa4e8d99d3ab5cc08d4d7d09d92c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index 2946517ae..5c120ba83 100644
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -9,15 +9,12 @@ searchpaths = []
 resolvconf  = ''
 
 case hoster
-  when "ubcece" then
-    searchpaths << "debprivate-ubc.debian.org"
-    nameservers += ["206.12.19.5", "137.82.1.1", "142.103.1.1" ]
   when "darmstadt" then
     case hostname
       when "draghi", "liszt" then
         nameservers << "127.0.0.1"
     end
-    nameservers += ["82.195.66.249", "217.198.242.225"]
+    nameservers += ["82.195.75.81", "82.195.66.249", "217.198.242.225"]
     searchpaths << "debprivate-darmstadt.debian.org"
   when "ftcollins" then
     case hostname
@@ -26,6 +23,12 @@ 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
 
 searchpaths << "debian.org"