projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
continued fight against templates
[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
1ce76cd
..
a36665f
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!"
else
if nameservers.empty?
#raise Puppet::ParseError, "Something has gone wrong writing resolv.conf. No nameservers to use!"
- STDERR.puts "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
nameservers << '8.8.8.8'
nameservers << '8.8.4.4'
end