eximconf: add more RBL config to the default options setup

[mirror/dsa-puppet.git] / modules / resolv / templates / resolv.conf.erb

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index 2a9f463..9d4e8f8 100644 (file)
--- 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") %>