X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ec8cf91536c685f3bb66d526d0f75ebaf662c6cc..5e24e241c48aae55fe5a81b73a832922ae700824:/cookbooks/exim/templates/default/exim4.conf.erb?ds=inline

diff --git a/cookbooks/exim/templates/default/exim4.conf.erb b/cookbooks/exim/templates/default/exim4.conf.erb
index f02b4193f..f37dad240 100644
--- 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
+  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