### USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
###
-<%=
-nameservers = []
-searchpaths = []
-resolvconf = ''
-if %w{draghi liszt widor spohr samosa}.include?(hostname)
- nameservers << "127.0.0.1"
-end
-
-nameservers += hosterinfo['nameservers'] if hosterinfo['nameservers']
-searchpaths += hosterinfo['searchpaths'] if hosterinfo['searchpaths']
-
-searchpaths << "debian.org"
+<%
+nameservers = @ns
if nameservers.empty?
- raise Puppet::ParseError, "Something has gone wrong writing resolv.conf: probably included for wrong hoster"
-end
-
-resolvconf += "search " + searchpaths.join(" ") + "\n"
-nameservers.each do |ns|
- resolvconf += "nameserver " + ns + "\n"
+ 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
-resolvconf
%>
+
+<% if @searchpaths.size() > 0 %>
+search <%= @searchpaths.join(" ") %>
+<% end -%>
+
+<%= nameservers.map{ |ns| "nameserver #{ns}"}.join("\n") %>
+
+<% if @resolvoptions.size() > 0 %>
+options <%= @searchpaths.join(" ") %>
+<% end -%>