From: Peter Palfrader Date: Tue, 1 Mar 2011 11:22:11 +0000 (+0100) Subject: And manda, dgi and ftc X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=1793966c957b29380dd706130182e46f48122b5e And manda, dgi and ftc --- diff --git a/modules/debian-org/misc/hoster.yaml b/modules/debian-org/misc/hoster.yaml index c4e59ed8..c21ac5ea 100644 --- a/modules/debian-org/misc/hoster.yaml +++ b/modules/debian-org/misc/hoster.yaml @@ -44,15 +44,20 @@ darmstadt: - 82.195.75.64/26 - 82.195.75.32/28 - 2001:41b8:202:deb::/64 + searchpaths: [debprivate-darmstadt.debian.org] + nameservers: [82.195.75.81, 82.195.66.249, 217.198.242.225] dgi: netrange: - 93.94.130.128/26 + nameservers: [195.49.152.215, 195.49.152.213, 195.49.152.214] freenet: netrange: - 62.104.0.0/16 ftcollins: netrange: - 192.25.206.0/24 + searchpaths: [debprivate-debprivate-ftcollins.debian.org] + nameservers: [192.25.206.33, 192.25.206.57] grnet: netrange: - 194.177.211.192/27 diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb index fb0288e5..4f7cd63d 100644 --- a/modules/resolv/templates/resolv.conf.erb +++ b/modules/resolv/templates/resolv.conf.erb @@ -8,27 +8,8 @@ nameservers = [] searchpaths = [] resolvconf = '' -case hosterinfo["name"] - 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 "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" +if %w{draghi liszt widor spohr samosa}.include?(hostname) + nameservers << "127.0.0.1" end nameservers += hosterinfo['nameservers'] if hosterinfo['nameservers']