X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fresolv%2Ftemplates%2Fresolv.conf.erb;h=6e02dbb8e7ae576d79c0181612af811e26ba85f7;hb=4e40e8078da4683fa24ee265c5dfb6faf8bc655a;hp=20b75692b8cab81b32ea232c27b681456db62bcc;hpb=c1f9b4855bc047dc0181065e0b25250e4e647246;p=mirror%2Fdsa-puppet.git

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index 20b75692b..6e02dbb8e 100644
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -1,12 +1,26 @@
-<%= 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 %>
+search <%= @searchpaths.join(" ") %>
+<% end -%>
+
+<%= nameservers.map{ |ns| "nameserver #{ns}"}.join("\n") %>
+
+<% if @resolvoptions.size() > 0 %>
+options <%= @searchpaths.join(" ") %>
+<% end -%>