X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ffiles%2Fcommon%2Frbllist;h=d217af5fdb5df0b0fad536a3dd03d297df0d4c55;hb=f5bdff6b668ca7c9e51c2a6d557c76b19cb8187d;hp=97ccd3b955907f0185d4d02b873d8b5a339b92b5;hpb=be70abdd6ebea0169f6e65d766554a4e2379a484;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/files/common/rbllist b/modules/exim/files/common/rbllist
index 97ccd3b95..d217af5fd 100644
--- a/modules/exim/files/common/rbllist
+++ b/modules/exim/files/common/rbllist
@@ -3,28 +3,39 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-admin : list.dsbl.org : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : bl.spamcop.net
-books : list.dsbl.org : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : bl.spamcop.net
-cdvendors : list.dsbl.org : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : bl.spamcop.net
-consultants : list.dsbl.org : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : bl.spamcop.net
-da-manager : list.dsbl.org : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org
-ftpmaster : list.dsbl.org : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org
-ftp-master : list.dsbl.org : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org
-gandi-discount : list.dsbl.org : 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
+data-protection : zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org
+diversity : 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 : list.dsbl.org : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : bl.spamcop.net
-leader : sbl-xbl.spamhaus.org
+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 : list.dsbl.org : 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 : list.dsbl.org : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org
-new-maintainer : list.dsbl.org : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org
-override-change : list.dsbl.org : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org
-partners : list.dsbl.org : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : bl.spamcop.net
-planet : list.dsbl.org : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org
-preinstallvendors : list.dsbl.org : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : bl.spamcop.net
+mirrors : zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org
+nagios : 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 : list.dsbl.org : zen.spamhaus.org : dul.dnsbl.sorbs.net : dnsbl.ahbl.org : bl.spamcop.net
-webmaster : list.dsbl.org : 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