From: Stephen Gran <steve@lobefin.net>
Date: Thu, 23 Jul 2009 20:20:24 +0000 (+0100)
Subject: Allow blacklists
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e6994f97b01deba2a8704948f9fe57e676bbea2f;p=mirror%2Fdsa-puppet.git

Allow blacklists
Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 929b4a580..cf8202851 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -816,6 +816,10 @@ out
   accept  local_parts   = postmaster
           domains       = +handled_domains : +rcpthosts
 
+  deny    hosts        = ${if exists{/etc/exim4/host_blacklist}{/etc/exim4/host_blacklist}{}}
+          message      = I'm terribly sorry, but it seems you have been blacklisted
+          log_message  = blacklisted IP
+
   deny   log_message   = <$sender_address> is blacklisted
          senders       = ${if exists{/etc/exim4/blacklist}{/etc/exim4/blacklist}{}}
          message       = We have blacklisted <$sender_address>.  Please stop mailing us