From: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Mon, 14 Oct 2019 20:08:33 +0000 (+0100)
Subject: eximconf: more RBLs for the default set
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=f79fdb6bb13b6eb8a0c8b0dcf117a2c3e0e241c6

eximconf: more RBLs for the default set

Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
---

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index f55c0f796..0cd231b82 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -897,7 +897,7 @@ check_recipient:
 
   deny    message   = host $sender_host_address is listed in $dnslist_domain; see $dnslist_text
           condition = ${if bool_lax{HAS_DEFAULT_OPTIONS}}
-          dnslists  = relays.dnsbl.sorbs.net
+          dnslists  = relays.dnsbl.sorbs.net : xbl.spamhaus.org
           domains   = +handled_domains
           !hosts    = +debianhosts : WHITELIST
 
@@ -916,6 +916,12 @@ check_recipient:
           domains  = +handled_domains
           !hosts   = +debianhosts : WHITELIST
 
+  deny    message   = domain $sender_address_domain is listed in $dnslist_domain; see $dnslist_text
+          condition = ${if bool_lax{HAS_DEFAULT_OPTIONS}}
+          dnslists  = dbl.spamhaus.org/$sender_address_domain
+          domains   = +handled_domains
+          !hosts    = +debianhosts : WHITELIST
+
 <%- unless @use_smarthost -%>
   deny    domains  = +handled_domains
           local_parts = ${if match_domain{$domain}{+virtual_domains}\