X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fresolv%2Ftemplates%2Fresolv.conf.erb;h=9d4e8f86bee5f5f96b10bd337f78bf1e9022ad0e;hb=9b3b9b27fccaa62aae90ef3713d3af0407116854;hp=2a9f4631d867eba4b19e71c8d677f9fb7655901f;hpb=471d375994f5b5ceadaafa80778406d71fecb86a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index 2a9f4631d..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 %>
-options <%= @searchpaths.join(" ") %>
+search <%= @searchpaths.join(" ") %>
 <% end -%>
 
 <%= nameservers.map{ |ns| "nameserver #{ns}"}.join("\n") %>