Tweak spam block

diff --git a/cookbooks/exim/templates/default/exim4.conf.erb b/cookbooks/exim/templates/default/exim4.conf.erb
index e9cb2b9c1fb7f045f304bd57383b5d377b8417be..2430e17becf7a21473c6f7201cda3db2b380567a 100644 (file)
--- a/cookbooks/exim/templates/default/exim4.conf.erb
+++ b/cookbooks/exim/templates/default/exim4.conf.erb
@@ -498,9 +498,11 @@ 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.php

   #   X-PHP-Originating-Script: <digits>:SendMail.class.php
   #   X-PHP-Originating-Script: <digits>:SendMail.class.php

+  #   X-PHP-Originating-Script: <digits>:ExtendedMail.php

   #   X-PHP-Originating-Script: <digits>:ExtendedMail.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\$}}
+  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.
           message    = This message failed local spam checks.
 
   # Accept the message.