From: Martin Zobel-Helas <zobel@debian.org>
Date: Wed, 22 Dec 2010 14:36:53 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... 
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e733600e917f78330b957715d1a2cf6d06c18963;hp=dfd79c4d4c6aa06b2a0a028586c4df176d75672b;p=dsa-puppet.git

Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  remove cimarosa
  remove bartok
  <aurel32> one of the two machines I use to access the BSD machines (field, finzi, fano, fasch) got its IP changed recently
  ignore some pg9 related packages on sibelius and stabile
  Set up port forwarding from stabile to sibelius
---

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index 5c120ba8..d612f753 100644
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -26,9 +26,12 @@ case hoster
   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"]
+    searchpaths << "debprivate-osuosl.debian.org"
   when "ubcece" then
-    searchpaths << "debprivate-ubc.debian.org"
     nameservers += ["206.12.19.5", "137.82.1.1", "142.103.1.1" ]
+    searchpaths << "debprivate-ubc.debian.org"
 end
 
 searchpaths << "debian.org"