Block bounce messages to certain users

[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 b5360c5844a307a3adeb3aa69c9fb13d6815a2f4..3c187d699587a78858f6abccdbb6bb2198df9757 100644 (file)
--- a/cookbooks/exim/templates/default/exim4.conf.erb
+++ b/cookbooks/exim/templates/default/exim4.conf.erb
@@ -306,6 +306,12 @@ log_selector = +all -skip_delivery
 trusted_users = <%= node[:exim][:trusted_users].join(" : ") %>
 
 
 trusted_users = <%= node[:exim][:trusted_users].join(" : ") %>
 
 

+# Don't keep any environment when starting programs - this is the
+# default but setting it stops exim warning
+
+keep_environment =
+
+

 
 ######################################################################
 #                       ACL CONFIGURATION                            #
 
 ######################################################################
 #                       ACL CONFIGURATION                            #


@@ -371,9 +377,14 @@ acl_check_rcpt:
 
   deny    message       = Restricted characters in address
           domains       = !+local_domains
 
   deny    message       = Restricted characters in address
           domains       = !+local_domains

-          local_parts   = ^[./|] : ^.*[@%!] : ^.*/\\.\\./
+          local_parts   = ^[./|] : ^.*[@!] : ^.*/\\.\\./

   #############################################################################
 
   #############################################################################
 

+  # Block bounces to selected addresses
+
+  deny    local_parts   = root:postmaster:webmaster:abuse:support
+          senders       = :
+

   # Accept mail to postmaster in any local domain, regardless of the source,
   # and without verifying the sender.
 
   # Accept mail to postmaster in any local domain, regardless of the source,
   # and without verifying the sender.
 


@@ -385,10 +396,6 @@ acl_check_rcpt:
   deny   !hosts         = +relay_from_hosts
          !verify        = sender
 
   deny   !hosts         = +relay_from_hosts
          !verify        = sender
 

-  deny   !hosts         = +relay_from_hosts
-         !senders       = lsearch*@;/etc/exim4/callout_exempt_senders
-         !verify        = sender/callout/defer_ok
-

   # Accept if the message comes from one of the hosts for which we are an
   # outgoing relay. It is assumed that such hosts are most likely to be MUAs,
   # so we set control=submission to make Exim treat the message as a
   # Accept if the message comes from one of the hosts for which we are an
   # outgoing relay. It is assumed that such hosts are most likely to be MUAs,
   # so we set control=submission to make Exim treat the message as a


@@ -529,7 +536,7 @@ begin routers
 
 system_aliases:
   driver = redirect
 
 system_aliases:
   driver = redirect

-  domains = +local_domains
+  domains = !noreply.openstreetmap.org : +local_domains

   allow_fail
   allow_defer
   data = ${lookup{$local_part}lsearch{/etc/aliases}}
   allow_fail
   allow_defer
   data = ${lookup{$local_part}lsearch{/etc/aliases}}


@@ -707,6 +714,7 @@ noreply:
   driver = pipe
   command = <%= details[:command] %>
   home_directory = <%= details[:home_directory] %>
   driver = pipe
   command = <%= details[:command] %>
   home_directory = <%= details[:home_directory] %>

+  path = <%= details[:path] || "/bin:/usr/bin" %>

   return_output
 <% else -%>
   driver = appendfile
   return_output
 <% else -%>
   driver = appendfile