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:
ae44d95
)
continued fight against templates, 2
author
Peter Palfrader
<peter@palfrader.org>
Sat, 5 Mar 2011 12:45:30 +0000
(13:45 +0100)
committer
Peter Palfrader
<peter@palfrader.org>
Sat, 5 Mar 2011 12:45:30 +0000
(13:45 +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
a36665f
..
e7ecf53
100644
(file)
--- a/
modules/resolv/templates/resolv.conf.erb
+++ b/
modules/resolv/templates/resolv.conf.erb
@@
-26,7
+26,7
@@
if defined?(unbound) and unbound and unbound == "true"
else
if nameservers.empty?
#raise Puppet::ParseError, "Something has gone wrong writing resolv.conf. No nameservers to use!"
-
#scope.function_warning("Something has gone wrong writing resolv.conf. No nameservers to use - using google's!"
)
+
scope.function_warning(["Something has gone wrong writing resolv.conf. No nameservers to use - using google's!"]
)
nameservers << '8.8.8.8'
nameservers << '8.8.4.4'
end