From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 6 Jan 2015 20:20:04 +0000 (+0100)
Subject: Remove any references to ahbl.org blocklists as they have shut down (re: RT#5684)
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=5710d33e6c35c24a08f371d082e3f5a8db8e7771;p=mirror%2Fdsa-puppet.git

Remove any references to ahbl.org blocklists as they have shut down (re: RT#5684)
---

diff --git a/modules/exim/files/common/rbllist b/modules/exim/files/common/rbllist
index 71d5c6b37..defbd2113 100644
--- a/modules/exim/files/common/rbllist
+++ b/modules/exim/files/common/rbllist
@@ -3,32 +3,32 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-admin : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : bl.spamcop.net
-books : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : bl.spamcop.net
-cdvendors : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : bl.spamcop.net
-consultants : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : bl.spamcop.net
-da-manager : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : combined.njabl.org
-events: zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org
-ftpmaster : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : combined.njabl.org
-ftp-master : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : combined.njabl.org
+admin : zen.spamhaus.org : dul.dnsbl.sorbs.net : bl.spamcop.net
+books : zen.spamhaus.org : dul.dnsbl.sorbs.net : bl.spamcop.net
+cdvendors : zen.spamhaus.org : dul.dnsbl.sorbs.net : bl.spamcop.net
+consultants : zen.spamhaus.org : dul.dnsbl.sorbs.net : bl.spamcop.net
+da-manager : zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org
+events: zen.spamhaus.org : dul.dnsbl.sorbs.net
+ftpmaster : zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org
+ftp-master : zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org
 hardware-donations : sbl-xbl.spamhaus.org
 hostmaster : sbl-xbl.spamhaus.org : cbl.abuseat.org
 iana : sbl-xbl.spamhaus.org : cbl.abuseat.org
-keyring-maint : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : bl.spamcop.net
-leader : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : bl.spamcop.net
+keyring-maint : zen.spamhaus.org : dul.dnsbl.sorbs.net : bl.spamcop.net
+leader : zen.spamhaus.org : dul.dnsbl.sorbs.net : bl.spamcop.net
 mailer-daemon : sbl-xbl.spamhaus.org : cbl.abuseat.org
-merchandise : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : bl.spamcop.net
+merchandise : zen.spamhaus.org : dul.dnsbl.sorbs.net : bl.spamcop.net
 mia : sbl-xbl.spamhaus.org
-mirrors : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : combined.njabl.org
-new-maintainer : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : combined.njabl.org
-override-change : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : combined.njabl.org
-partners : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org
-planet : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : combined.njabl.org
-preinstallvendors : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : bl.spamcop.net
-press: zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org
+mirrors : zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org
+new-maintainer : zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org
+override-change : zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org
+partners : zen.spamhaus.org : dul.dnsbl.sorbs.net
+planet : zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org
+preinstallvendors : zen.spamhaus.org : dul.dnsbl.sorbs.net : bl.spamcop.net
+press: zen.spamhaus.org : dul.dnsbl.sorbs.net
 rmurray : sbl-xbl.spamhaus.org
-security: zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : combined.njabl.org
+security: zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org
 treasurer : sbl-xbl.spamhaus.org
-wat : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : combined.njabl.org
-wbadm : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : bl.spamcop.net
-webmaster : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : bl.spamcop.net
+wat : zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org
+wbadm : zen.spamhaus.org : dul.dnsbl.sorbs.net : bl.spamcop.net
+webmaster : zen.spamhaus.org : dul.dnsbl.sorbs.net : bl.spamcop.net
diff --git a/modules/exim/files/common/rhsbllist b/modules/exim/files/common/rhsbllist
index fdad8a702..9c3d71481 100644
--- a/modules/exim/files/common/rhsbllist
+++ b/modules/exim/files/common/rhsbllist
@@ -3,25 +3,25 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-admin : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain : rhsbl.ahbl.org/$sender_address_domain
-books : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain : rhsbl.ahbl.org/$sender_address_domain
-cdvendors : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain : rhsbl.ahbl.org/$sender_address_domain
-consultants : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain : rhsbl.ahbl.org/$sender_address_domain
-da-manager : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain : rhsbl.ahbl.org/$sender_address_domain
-events : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain : rhsbl.ahbl.org/$sender_address_domain
-ftp-master : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain : rhsbl.ahbl.org/$sender_address_domain
-ftpmaster : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain : rhsbl.ahbl.org/$sender_address_domain
-hostmaster : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain : rhsbl.ahbl.org/$sender_address_domain
-iana : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain : rhsbl.ahbl.org/$sender_address_domain
-keyring-maint : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain : rhsbl.ahbl.org/$sender_address_domain
-mailer-daemon : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain : rhsbl.ahbl.org/$sender_address_domain
-merchandise : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain : rhsbl.ahbl.org/$sender_address_domain
-mirrors : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain : rhsbl.ahbl.org/$sender_address_domain
-new-maintainer : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain : rhsbl.ahbl.org/$sender_address_domain
-override-change : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain : rhsbl.ahbl.org/$sender_address_domain
-partners : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain : rhsbl.ahbl.org/$sender_address_domain
-preinstallvendors : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain : rhsbl.ahbl.org/$sender_address_domain
-press : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain : rhsbl.ahbl.org/$sender_address_domain
-wat : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain : rhsbl.ahbl.org/$sender_address_domain
-wbadm : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain : rhsbl.ahbl.org/$sender_address_domain
-webmaster : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain : rhsbl.ahbl.org/$sender_address_domain
+admin : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain
+books : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain
+cdvendors : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain
+consultants : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain
+da-manager : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain
+events : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain
+ftp-master : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain
+ftpmaster : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain
+hostmaster : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain
+iana : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain
+keyring-maint : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain
+mailer-daemon : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain
+merchandise : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain
+mirrors : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain
+new-maintainer : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain
+override-change : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain
+partners : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain
+preinstallvendors : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain
+press : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain
+wat : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain
+wbadm : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain
+webmaster : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain