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

* '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 5c120ba834a51aed424d459b350decb704c62447..d612f753bdd9f5559f45e8798052e212503653e3 100644 (file)
--- 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"