Add geodns map for nominatim

[chef.git] / cookbooks / exim / templates / default / exim4.conf.erb

diff --git a/cookbooks/exim/templates/default/exim4.conf.erb b/cookbooks/exim/templates/default/exim4.conf.erb
index 18544c091746dbd64a3153e3385f0b1c2ee1a49a..0a4f1d04f249c3b4bde08863dddac8ffb701f80a 100644 (file)
--- a/cookbooks/exim/templates/default/exim4.conf.erb
+++ b/cookbooks/exim/templates/default/exim4.conf.erb
@@ -494,9 +494,8 @@ acl_check_data:
   # Deny if the message contains a virus. Before enabling this check, you
   # must install a virus scanner and set the av_scanner option above.
   #
-  deny    demime     = *
-          malware    = *
-          message    = This message contains a virus ($malware_name).
+  deny    malware    = *
+          message    = This message was detected as possible malware ($malware_name).
 
 <% end -%>
 <% if File.exist?("/var/run/spamd.pid") -%>
@@ -733,6 +732,9 @@ noreply:
   command = <%= details[:command] %>
   home_directory = <%= details[:home_directory] %>
   path = <%= details[:path] || "/bin:/usr/bin" %>
+<% if details[:environment] -%>
+  environment = <%= details[:environment].map { |k,v| "#{k}=#{v}" }.join(":") %>
+<% end -%>
   return_fail_output
 <% else -%>
   driver = appendfile