-<%= resolvconf = case hoster
- when "ubcece" then "search debprivate-ubc.debian.org debian.org
-nameserver 206.12.19.5
-nameserver 137.82.1.1
-nameserver 142.103.1.1
-"
+##
+### THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+### USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+###
+
+
+<%
+nameservers = @nameservers
+
+if nameservers.empty?
+ 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
-if resolvconf == ""
- raise Puppet::ParseError, "resolv.conf is empty"
-end
-resolvconf
+
%>
+
+<% if @searchpaths.size() > 0 %>
+options <%= @searchpaths.join(" ") %>
+<% end -%>
+
+<%= nameservers.map{ |ns| "nameserver #{ns}"}.join("\n") %>
+
+<% if @resolvoptions.size() > 0 %>
+options <%= @searchpaths.join(" ") %>
+<% end -%>