projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No longer allow nagios to recurse on our binds
[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
a42aa25
..
9d4e8f8
100644
(file)
--- a/
modules/resolv/templates/resolv.conf.erb
+++ b/
modules/resolv/templates/resolv.conf.erb
@@
-3,35
+3,24
@@
### USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
###
### USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
###
-<%
-searchpaths = []
-searchpaths += @sp
-searchpaths << "debian.org" -%>
-search <%= searchpaths.to_a.flatten.join(" ") %>
-<%
-nameservers = []
-if %w{draghi}.include?(@hostname)
- nameservers << "127.0.0.1"
-end
-nameservers += @ns
-if @unbound && @unbound == "true"
- nameservers = ['127.0.0.1']
-end
+<%
+nameservers = @ns
if nameservers.empty?
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!"])
nameservers << '8.8.8.8'
nameservers << '8.8.4.4'
end
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.to_a.flatten.each do |nms| -%>
-nameserver <%= nms %>
+%>
+
+<% if @searchpaths.size() > 0 %>
+search <%= @searchpaths.join(" ") %>
<% end -%>
<% end -%>
-<%
-options = []
-options += @opts -%>
-<%
options.to_a.flatten.each do |opt| -
%>
-options <%=
opt
%>
+
+<%= nameservers.map{ |ns| "nameserver #{ns}"}.join("\n") %>
+
+<%
if @resolvoptions.size() > 0
%>
+options <%=
@searchpaths.join(" ")
%>
<% end -%>
<% end -%>