From 7b95faf44b2bbe383548ca5db4ac5e948e8db705 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Fri, 15 Jan 2010 01:01:10 +0000 Subject: [PATCH] add resolv class for grnet Signed-off-by: Stephen Gran --- manifests/site.pp | 2 +- modules/resolv/templates/resolv.conf.erb | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 092f3212..64b54d2d 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -81,6 +81,6 @@ node default { "true": { include hosts } } case $hoster { - "ubcece", "darmstadt", "ftcollins": { include resolv } + "ubcece", "darmstadt", "ftcollins", "grnet": { include resolv } } } diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb index eb59db86..41e029d8 100644 --- a/modules/resolv/templates/resolv.conf.erb +++ b/modules/resolv/templates/resolv.conf.erb @@ -9,9 +9,6 @@ searchpaths = [] resolvconf = '' case hoster - when "ubcece" then - searchpaths << "debprivate-ubc.debian.org" - nameservers += ["206.12.19.5", "137.82.1.1", "142.103.1.1" ] when "darmstadt" then case hostname when "draghi", "liszt" then @@ -26,6 +23,12 @@ case hoster 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 "ubcece" then + searchpaths << "debprivate-ubc.debian.org" + nameservers += ["206.12.19.5", "137.82.1.1", "142.103.1.1" ] end searchpaths << "debian.org" -- 2.39.2