Only return output from exim when a pipe command fails

[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 f37dad240764f84b97ec9839748cef5bd4f29095..530b105d43a7daf06f1431b49b702602bd201d46 100644 (file)
--- a/cookbooks/exim/templates/default/exim4.conf.erb
+++ b/cookbooks/exim/templates/default/exim4.conf.erb
@@ -330,9 +330,7 @@ acl_check_rcpt:
   # testing for an empty sending host field.
 
   accept  hosts = :
   # testing for an empty sending host field.
 
   accept  hosts = :

-<% if node[:lsb][:release].to_i >= 10.04 -%>

           control = dkim_disable_verify
           control = dkim_disable_verify

-<% end -%>

 
   #############################################################################
   # The following section of the ACL is concerned with local parts that contain
 
   #############################################################################
   # The following section of the ACL is concerned with local parts that contain


@@ -387,7 +385,7 @@ acl_check_rcpt:
 
   # Block sender of spam backscatter
 
 
   # Block sender of spam backscatter
 

-  deny    senders       = www-data@www.easyticket.de:*@email.realestate.co.nz:sipdentistry@mail.mediaworksonline.com:www-data@*.consoglobe.com:lina-noreply@jobstreet.com:apache@704210-web2.tristatecamera.com:webmaster@openstreetmap.org
+  deny    senders       = www-data@www.easyticket.de:*@email.realestate.co.nz:sipdentistry@mail.mediaworksonline.com:www-data@*.consoglobe.com:lina-noreply@jobstreet.com:apache@704210-web2.tristatecamera.com:webmaster@openstreetmap.org:noreply@pring.co.uk:admin@honeygame.com

           !hosts        = +relay_from_hosts
 
   # Accept mail to postmaster in any local domain, regardless of the source,
           !hosts        = +relay_from_hosts
 
   # Accept mail to postmaster in any local domain, regardless of the source,


@@ -422,9 +420,7 @@ acl_check_rcpt:
 
   accept  hosts         = +relay_from_hosts
           control       = submission
 
   accept  hosts         = +relay_from_hosts
           control       = submission

-<% if node[:lsb][:release].to_i >= 10.04 -%>

           control       = dkim_disable_verify
           control       = dkim_disable_verify

-<% end -%>

 
   # Accept if the message arrived over an authenticated connection, from
   # any host. Again, these messages are usually from MUAs, so recipient
 
   # Accept if the message arrived over an authenticated connection, from
   # any host. Again, these messages are usually from MUAs, so recipient


@@ -433,9 +429,7 @@ acl_check_rcpt:
 
   accept  authenticated = *
           control       = submission
 
   accept  authenticated = *
           control       = submission

-<% if node[:lsb][:release].to_i >= 10.04 -%>

           control       = dkim_disable_verify
           control       = dkim_disable_verify

-<% end -%>

 
   # Insist that any other recipient address that we accept is either in one of
   # our local domains, or is in a domain for which we explicitly allow
 
   # Insist that any other recipient address that we accept is either in one of
   # our local domains, or is in a domain for which we explicitly allow


@@ -504,9 +498,10 @@ acl_check_data:
 
 <% end -%>
   # Deny spammy messages with headers of the form:
 
 <% end -%>
   # Deny spammy messages with headers of the form:

-  #   X-PHP-Originating-Script: <digits>:SendMail.class.php
-  #   X-PHP-Originating-Script: <digits>:ExtendedMail.class.php
-  deny    condition  = ${if match {$h_X-PHP-Originating-Script:}{^[0-9]+:(Send|Extended)Mail\\.class\\.php\$}}
+  #   X-PHP-Originating-Script: <digits>:<name>.php
+  #   X-PHP-Originating-Script: <digits>:<name>.class.php
+  deny    condition  = ${if match {$h_X-PHP-Originating-Script:}{^[0-9]+:[A-Za-z]+(\\.class)?\\.php\$}}
+         !hosts      = +relay_from_hosts

           message    = This message failed local spam checks.
 
   # Accept the message.
           message    = This message failed local spam checks.
 
   # Accept the message.


@@ -726,7 +721,7 @@ noreply:
   command = <%= details[:command] %>
   home_directory = <%= details[:home_directory] %>
   path = <%= details[:path] || "/bin:/usr/bin" %>
   command = <%= details[:command] %>
   home_directory = <%= details[:home_directory] %>
   path = <%= details[:path] || "/bin:/usr/bin" %>

-  return_output
+  return_fail_output

 <% else -%>
   driver = appendfile
 <% if details[:file] -%>
 <% else -%>
   driver = appendfile
 <% if details[:file] -%>