Merge remote-tracking branch 'github/pull/102'

[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 3d6e3a40ae413e518eba439f44e1b1c2b8978054..f37dad240764f84b97ec9839748cef5bd4f29095 100644 (file)
--- a/cookbooks/exim/templates/default/exim4.conf.erb
+++ b/cookbooks/exim/templates/default/exim4.conf.erb
@@ -387,7 +387,8 @@ acl_check_rcpt:
 
   # 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
+  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
+          !hosts        = +relay_from_hosts
 
   # Accept mail to postmaster in any local domain, regardless of the source,
   # and without verifying the sender.
@@ -502,6 +503,12 @@ acl_check_data:
           message    = This message scored $spam_score SpamAssassin points.
 
 <% 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\$}}
+          message    = This message failed local spam checks.
+
   # Accept the message.
 
   accept