X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fresolv%2Ftemplates%2Fresolv.conf.erb;h=5c120ba834a51aed424d459b350decb704c62447;hb=0a486dee252a7146b9a84ab0a96613822811af95;hp=fa648821a4fa0db29006bb4506f37cb3aaa52ae0;hpb=d90e56e8dce02e7dddf90367de47a1e6e78d8e0e;p=mirror%2Fdsa-puppet.git diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb index fa648821a..5c120ba83 100644 --- a/modules/resolv/templates/resolv.conf.erb +++ b/modules/resolv/templates/resolv.conf.erb @@ -9,23 +9,26 @@ 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.66.249", "217.198.242.225"] + 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.59"] + 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"