From 170732f28635980fe2f70f868db4a9c778834f30 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 1 Mar 2011 12:13:51 +0100 Subject: [PATCH] move dns info for ubc to hosters.yaml --- modules/debian-org/misc/hoster.yaml | 2 ++ modules/resolv/templates/resolv.conf.erb | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/debian-org/misc/hoster.yaml b/modules/debian-org/misc/hoster.yaml index e4ad017a..c241ebda 100644 --- a/modules/debian-org/misc/hoster.yaml +++ b/modules/debian-org/misc/hoster.yaml @@ -95,6 +95,8 @@ ubcece: netrange: - 137.82.84.64/27 - 206.12.19.0/24 + searchpaths: [debprivate-ubc.debian.org] + nameservers: [206.12.19.5, 137.82.1.1, 142.103.1.1] ugent: netrange: - 157.193.0.0/16 diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb index e5ddafe0..8c0166b0 100644 --- a/modules/resolv/templates/resolv.conf.erb +++ b/modules/resolv/templates/resolv.conf.erb @@ -34,11 +34,11 @@ case hosterinfo["name"] 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 +nameservers += hosterinfo['nameservers'] if hosterinfo['nameservers'] +searchpaths += hosterinfo['searchpaths'] if hosterinfo['searchpaths'] + searchpaths << "debian.org" if nameservers.empty? -- 2.39.2