X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ffiles%2Fcommon%2Frbllist;h=4ae9b91e74af787ae875af259e3354ccad1b2d2d;hb=a44f662ab8f6500db0bbd3b8f0eb603b0248319d;hp=6716674d77981fa3d5f926f9e38c2c9049b40776;hpb=8131395e7599b61551cab9c46bb9ca27c77ed7ed;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/files/common/rbllist b/modules/exim/files/common/rbllist
index 6716674d7..4ae9b91e7 100644
--- a/modules/exim/files/common/rbllist
+++ b/modules/exim/files/common/rbllist
@@ -3,30 +3,36 @@
 ## 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
-events: zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org
-ftpmaster : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org
-ftp-master : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org
-gandi-discount : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : bl.spamcop.net
+admin : zen.spamhaus.org : dul.dnsbl.sorbs.net : bl.spamcop.net
+antiharassment : 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
-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
+iana : sbl-xbl.spamhaus.org : cbl.abuseat.org
+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
-new-maintainer : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org
-override-change : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org
-partners : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org
-planet : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.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
+patents: zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org
+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
+salsa-admin : zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org
+security: zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org
+trademark: zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org
 treasurer : sbl-xbl.spamhaus.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