X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fresolv%2Ftemplates%2Fresolv.conf.erb;h=785a419ca840c4c17cb1992807c42f67287e5a5a;hb=0b75d6cc7907ec14efbd94465b251bb1e416cc2f;hp=eb59db861f7c98072bdabdc8fe176dd7959aed11;hpb=fcbf04aea39b64665b78d2e48b7a38b5f6579514;p=mirror%2Fdsa-puppet.git diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb index eb59db861..785a419ca 100644 --- a/modules/resolv/templates/resolv.conf.erb +++ b/modules/resolv/templates/resolv.conf.erb @@ -9,15 +9,12 @@ 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 nameservers << "127.0.0.1" end - nameservers += ["82.195.75.81", "82.195.66.249", "217.198.242.225"] + nameservers += ["82.195.75.91", "82.195.75.81", "82.195.66.249", "217.198.242.225"] searchpaths << "debprivate-darmstadt.debian.org" when "ftcollins" then case hostname @@ -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"