Remove forced downgrade of hp-health

[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 ca868683ac9cc9ccd79405e3b8d6b90c2a39181f..d990c061b494f6c5900661f6fe8c1de6dfbc2340 100644 (file)
--- a/cookbooks/exim/templates/default/exim4.conf.erb
+++ b/cookbooks/exim/templates/default/exim4.conf.erb
@@ -383,9 +383,10 @@ acl_check_rcpt:
   deny    local_parts   = root:postmaster:webmaster:abuse:support
           senders       = :
 
   deny    local_parts   = root:postmaster:webmaster:abuse:support
           senders       = :
 

-  # Block sender of spam backscatter
+  # Block blacklisted senders

 
 

-  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       = lsearch*@;/etc/exim4/blocked-senders
+          message       = Rejected because $sender_address is blacklisted\nQueries to postmaster@$qualify_domain

           !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,


@@ -501,6 +502,7 @@ acl_check_data:
   #   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\$}}
   #   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.


@@ -720,7 +722,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] -%>