X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fresolv%2Ftemplates%2Fresolv.conf.erb;h=69e1b62652ddd42c21fb13112bd783b4262d8e09;hb=2f7ccfc68988cc1c18dc07eefec188bb4a42315a;hp=20b75692b8cab81b32ea232c27b681456db62bcc;hpb=c1f9b4855bc047dc0181065e0b25250e4e647246;p=dsa-puppet.git

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index 20b75692..69e1b626 100644
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -1,12 +1,48 @@
-<%= resolvconf = case hoster
-    when "ubcece" then "search debprivate-ubc.debian.org debian.org
-nameserver 206.12.19.5
-nameserver 137.82.1.1
-nameserver 142.103.1.1
-"
+##
+### THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+### USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+###
+
+<%=
+nameservers = []
+searchpaths = []
+resolvconf  = ''
+
+case hoster
+  when "darmstadt" then
+    case hostname
+      when "draghi", "liszt" then
+        nameservers << "127.0.0.1"
+    end
+    nameservers += ["82.195.75.81", "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.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
-if resolvconf = ""
-  raise Puppet::ParseError, "resolv.conf is empty"
+
+searchpaths << "debian.org"
+
+if nameservers.empty?
+  raise Puppet::ParseError, "Something has gone wrong writing resolv.conf: probably included for wrong hoster"
 end
+
+resolvconf += "search " + searchpaths.join(" ") + "\n"
+nameservers.each do |ns|
+  resolvconf += "nameserver " + ns + "\n"
+end
+
 resolvconf
 %>