From e21fd3cc14be0e49db65d6c6040e7ce658ff9ca6 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 8 Nov 2009 17:02:03 +0000 Subject: [PATCH] slightly more useful resolv.conf template Signed-off-by: Stephen Gran --- modules/resolv/templates/resolv.conf.erb | 35 ++++++++++++++++++------ 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb index e8873c88..1bf9dda1 100644 --- a/modules/resolv/templates/resolv.conf.erb +++ b/modules/resolv/templates/resolv.conf.erb @@ -3,15 +3,34 @@ ### USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git ### -<%= resolvconf = case hoster - when "ubcece" then "search debprivate-ubc.debian.org debian.org -nameserver 206.12.19.5 -nameserver 137.82.1.1 -nameserver 142.103.1.1 -" +<%= +nameservers = [] +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.239", "217.198.242.225"] + searchpaths << "debprivate-darmstadt.debian.org" +end + +searchpaths << "debian.org" + +if nameservers.empty? + raise Puppet::ParseError, "Something has gone wrong writing resolv.conf: probably included for wrong hoster" end -if resolvconf == "" - raise Puppet::ParseError, "resolv.conf is empty" + +resolvconf += "search " + searchpaths.sort.join(" ") + "\n" +nameservers.each do |ns| + resolvconf += "nameserver " + ns + "\n" end + resolvconf %> -- 2.39.2