X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fresolv%2Ftemplates%2Fresolv.conf.erb;h=9d4e8f86bee5f5f96b10bd337f78bf1e9022ad0e;hb=e91bb90b4afe134e8e1c0781b89650997b1d4960;hp=6f70f489f52605fb87a70a722aff93e00f07d22c;hpb=946a95b2879d19c72c8b78f5fce685f91d01ecbb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index 6f70f489f..9d4e8f86b 100644
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -5,7 +5,7 @@
 
 
 <%
-nameservers = @nameservers
+nameservers = @ns
 
 if nameservers.empty?
   scope.function_warning(["Something has gone wrong writing resolv.conf.  No nameservers to use - using google's!"])
@@ -16,7 +16,7 @@ end
 %>
 
 <% if @searchpaths.size() > 0 %>
-search <%= @searchpaths.join(" ") %> debian.org
+search <%= @searchpaths.join(" ") %>
 <% end -%>
 
 <%= nameservers.map{ |ns| "nameserver #{ns}"}.join("\n") %>