projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
[mirror/dsa-puppet.git]
/
modules
/
resolv
/
templates
/
resolv.conf.erb
diff --git
a/modules/resolv/templates/resolv.conf.erb
b/modules/resolv/templates/resolv.conf.erb
index
1bf9dda
..
8fa658d
100644
(file)
--- 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
when "draghi", "liszt" then
nameservers << "127.0.0.1"
end
- nameservers += ["82.195.75.81", "82.195.66.2
3
9", "217.198.242.225"]
+ nameservers += ["82.195.75.81", "82.195.66.2
4
9", "217.198.242.225"]
searchpaths << "debprivate-darmstadt.debian.org"
end
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
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
nameservers.each do |ns|
resolvconf += "nameserver " + ns + "\n"
end