projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
259ecf9
)
or that there
author
Peter Palfrader
<peter@palfrader.org>
Sat, 5 Mar 2011 12:28:09 +0000
(13:28 +0100)
committer
Peter Palfrader
<peter@palfrader.org>
Sat, 5 Mar 2011 12:28:09 +0000
(13:28 +0100)
modules/resolv/templates/resolv.conf.erb
patch
|
blob
|
history
diff --git
a/modules/resolv/templates/resolv.conf.erb
b/modules/resolv/templates/resolv.conf.erb
index
0ebef6c
..
f554d94
100644
(file)
--- a/
modules/resolv/templates/resolv.conf.erb
+++ b/
modules/resolv/templates/resolv.conf.erb
@@
-21,8
+21,7
@@
searchpaths << "debian.org"
resolvconf = ''
resolvconf += "search " + searchpaths.join(" ") + "\n"
-unbound = lookupvar('unbound')
-if unbound and unbound == "true"
+if defined?(unbound) and unbound and unbound == "true"
resolvconf += "nameserver 127.0.0.1\n"
else
if nameservers.empty?