projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More IPs for tfheen
[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
e7ecf53
..
531b516
100644
(file)
--- a/
modules/resolv/templates/resolv.conf.erb
+++ b/
modules/resolv/templates/resolv.conf.erb
@@
-8,7
+8,7
@@
nameservers = []
searchpaths = []
options = []
searchpaths = []
options = []
-if %w{draghi liszt
widor spohr
}.include?(hostname)
+if %w{draghi liszt}.include?(hostname)
nameservers << "127.0.0.1"
end
nameservers << "127.0.0.1"
end
@@
-21,7
+21,7
@@
searchpaths << "debian.org"
resolvconf = ''
resolvconf += "search " + searchpaths.join(" ") + "\n"
resolvconf = ''
resolvconf += "search " + searchpaths.join(" ") + "\n"
-if
defined?(unbound
) and unbound and unbound == "true"
+if
has_variable?('unbound'
) and unbound and unbound == "true"
resolvconf += "nameserver 127.0.0.1\n"
else
if nameservers.empty?
resolvconf += "nameserver 127.0.0.1\n"
else
if nameservers.empty?