X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fresolv%2Ftemplates%2Fresolv.conf.erb;h=84c98368b379040ff1c10a21a65e14e2625a74cf;hb=1bd1273a7c4eff1869ba892588a657b61b40465a;hp=8fa658de5fa57e6b3c410f5ae601b8e4257662dd;hpb=d957dfb1babc6d4e7e8c1bf2b5276765fda61031;p=mirror%2Fdsa-puppet.git

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index 8fa658de5..84c98368b 100644
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -9,9 +9,6 @@ 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
@@ -19,6 +16,27 @@ case hoster
     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"
+  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"]
+  when "ubcece" then
+    nameservers += ["206.12.19.5", "137.82.1.1", "142.103.1.1" ]
+    searchpaths << "debprivate-ubc.debian.org"
 end
 
 searchpaths << "debian.org"