add ftc resolv.con

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/manifests/site.pp b/manifests/site.pp
index abceb1fb71cbe45a37aae327a1111eaa286f870e..54711fe03f9453913eb55ead12cf8fcd892fbc1d 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -81,6 +81,6 @@ node default {
         "true":    { include hosts }
     }
     case $hoster {
-        "ubcece", "darmstadt":  { include resolv }
+        "ubcece", "darmstadt", "ftcollins":  { include resolv }
     }
 }

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index b16b145910cb509bdcc3fe90d5ad9674d6ed7b0a..fa648821a4fa0db29006bb4506f37cb3aaa52ae0 100644 (file)
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -19,6 +19,13 @@ case hoster
     end
     nameservers += ["82.195.66.249", "217.198.242.225"]
     searchpaths << "debprivate-darmstadt.debian.org"
+  when "ftcollins" then
+    case hostname
+      when "spohr", "samosa" then
+        nameservers << "127.0.0.1"
+    end
+    nameservers += ["192.25.206.33", "192.25.206.59"]
+    searchpaths << "debprivate-ftcollins.debian.org"
 end
 
 searchpaths << "debian.org"