[Minor] Sort & clean up spf-dkim/dmarc whitelists

 - Removed domains with SPF records indicating no authorised sources
 - Removed 'bad' domains

2 files changed, 7 insertions, 85 deletions

diff --git a/conf/dmarc_whitelist.inc b/conf/dmarc_whitelist.inc
index 0c5ebbfec..b15583571 100644
--- a/conf/dmarc_whitelist.inc
+++ b/conf/dmarc_whitelist.inc
@@ -32,13 +32,11 @@ paypal.com
 pch.com
 pinterest.com
 squarespace.com
-t.co
 twitter.com
 ups.com
 usps.com
 verizonwireless.com
 vk.com
-vk.me
 whatsapp.com
 zendesk.com
 zomato.com
diff --git a/conf/spf_dkim_whitelist.inc b/conf/spf_dkim_whitelist.inc
index 8b6fe803a..e265abbbc 100644
--- a/conf/spf_dkim_whitelist.inc
+++ b/conf/spf_dkim_whitelist.inc
@@ -17,8 +17,8 @@ allrecipes.com
 amazon.ca
 amazon.cn
 amazon.co.jp
-amazon.co.uk
 amazon.com
+amazon.co.uk
 amazon.de
 amazon.es
 amazon.fr
@@ -43,13 +43,6 @@ biglobe.ne.jp
 bitly.com
 bleacherreport.com
 blogger.com
-blogspot.co.id
-blogspot.com
-blogspot.de
-blogspot.in
-blogspot.jp
-blogspot.mx
-blogspot.ru
 bloomberg.com
 booking.com
 box.com
@@ -71,9 +64,9 @@ discovercard.com
 disqus.com
 dropbox.com
 ebay.ca
-ebay.co.uk
 ebay.com
 ebay.com.au
+ebay.co.uk
 ebay.de
 ebay.fr
 ebay.in
@@ -95,68 +88,6 @@ gawker.com
 github.com 2.0
 gizmodo.com
 godaddy.com
-goo.gl
-google.ae
-google.at
-google.az
-google.be
-google.bg
-google.ca
-google.ch
-google.cl
-google.cn
-google.co.id
-google.co.il
-google.co.in
-google.co.jp
-google.co.kr
-google.co.nz
-google.co.th
-google.co.uk
-google.co.ve
-google.co.za
-google.com
-google.com.ar
-google.com.au
-google.com.bd
-google.com.br
-google.com.co
-google.com.eg
-google.com.hk
-google.com.kw
-google.com.mx
-google.com.my
-google.com.ng
-google.com.pe
-google.com.ph
-google.com.pk
-google.com.sa
-google.com.sg
-google.com.tr
-google.com.tw
-google.com.ua
-google.com.vn
-google.cz
-google.de
-google.dk
-google.dz
-google.es
-google.fi
-google.fr
-google.gr
-google.hu
-google.ie
-google.it
-google.lk
-google.nl
-google.no
-google.pl
-google.pt
-google.ro
-google.rs
-google.ru
-google.se
-google.sk
 googleadservices.com
 googleusercontent.com
 groupon.com
@@ -194,6 +125,7 @@ mercadolivre.com.br
 messenger.com
 microsoft.com
 microsoftonline.com
+moikrug.ru
 neobux.com
 netflix.com
 newegg.com
@@ -202,19 +134,19 @@ nifty.com
 nikkeibp.co.jp
 nyaa.se
 nytimes.com
+odnoklassniki.ru
+ok.ru
 olx.ua
 overstock.com
 pandora.com
-paypal.com
 paypal.ca
 paypal.cn
-paypal.co.jp
-paypal.co.uk
 paypal.com
+paypal.com
+paypal.co.uk
 paypal.de
 paypal.es
 paypal.fr
-paypal.in
 paypal.it
 paypal.ru
 paytm.com
@@ -239,7 +171,6 @@ squarespace.com
 stumbleupon.com
 surveymonkey.com
 swagbucks.com
-t.co
 taboola.com
 taleo.net
 taobao.com
@@ -262,7 +193,6 @@ verizonwireless.com
 vimeo.com
 vine.co
 vk.com
-vk.me
 walmart.com
 wav.tv
 wellsfargo.com
@@ -276,17 +206,11 @@ wordpress.org
 wp.com
 xuite.net
 xvideos.com
-yahoo.com
 yelp.com
 youtube.com
-ytimg.com
 yts.to
 zappos.com
 zendesk.com
 zippyshare.com
 zomato.com
 zulily.com
-
-odnoklassniki.ru
-moikrug.ru
-ok.ru
\ No newline at end of file