X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fresolv%2Ftemplates%2Fresolv.conf.erb;h=b16b145910cb509bdcc3fe90d5ad9674d6ed7b0a;hb=b56fe1a401d49d0e6b7c6a098c0eb1910b603bc5;hp=1bf9dda18473cf0e5154a3eec3a6894727bbd72f;hpb=e21fd3cc14be0e49db65d6c6040e7ce658ff9ca6;p=dsa-puppet.git diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb index 1bf9dda1..b16b1459 100644 --- a/modules/resolv/templates/resolv.conf.erb +++ b/modules/resolv/templates/resolv.conf.erb @@ -17,7 +17,7 @@ case hoster when "draghi", "liszt" then nameservers << "127.0.0.1" end - nameservers += ["82.195.75.81", "82.195.66.239", "217.198.242.225"] + nameservers += ["82.195.66.249", "217.198.242.225"] searchpaths << "debprivate-darmstadt.debian.org" end @@ -27,7 +27,7 @@ if nameservers.empty? raise Puppet::ParseError, "Something has gone wrong writing resolv.conf: probably included for wrong hoster" end -resolvconf += "search " + searchpaths.sort.join(" ") + "\n" +resolvconf += "search " + searchpaths.join(" ") + "\n" nameservers.each do |ns| resolvconf += "nameserver " + ns + "\n" end