SPF: Remove old IPs. Add MX. Switch to Hard fail

diff --git a/src/openstreetmap b/src/openstreetmap
index 316970a005a6e9fe1fe00ed7cf621d849f59a898..7f2ec5fc8b95c52427ab238cfe07a11710b334aa 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -26,8 +26,10 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 
 # Publish an SPF record indicating that only shenron sends mail
 
-'openstreetmap:v=spf1 ip4\07289.16.179.150 ip4\072212.110.172.32 ip6\0722001\07241c8\07210\072996\07221d\0727dff\072fec3\072df70 ip6\0722001\07241c9\0721\072400\072\07232 ~all
-'otrs.openstreetmap:v=spf1 ip4\07289.16.179.150 ip4\072212.110.172.32 ip6\0722001\07241c8\07210\072996\07221d\0727dff\072fec3\072df70 ip6\0722001\07241c9\0721\072400\072\07232 ~all
+# https://anders.com/projects/sysadmin/djbdnsRecordBuilder/
+# v=spf1 ip4:212.110.172.32 ip6:2001:41c9:1:400::32 mx include:_spf.google.com -all
+'openstreetmap:v=spf1\040ip4\072212.110.172.32\040ip6\0722001\07241c9\0721\072400\072\07232\040mx\040include\072_spf.google.com\040-all:86400
+'otrs.openstreetmap:v=spf1\040ip4\072212.110.172.32\040ip6\0722001\07241c9\0721\072400\072\07232\040mx\040include\072_spf.google.com\040-all:86400
 
 # Google postmaster tools verification
 

diff --git a/src/osmfoundation b/src/osmfoundation
index 8b4a9278abfef12c84ed1a06a322ba64d010ea66..60720043e0bb3f3ab9d11e1de9424dfae430873d 100644 (file)
--- a/src/osmfoundation
+++ b/src/osmfoundation
@@ -13,8 +13,9 @@
 :osmfoundation:257:\000\005\151\163\163\165\145\154\145\164\163\145\156\143\162\171\160\164\056\157\162\147
 
 # SPF Record
-
-'osmfoundation:v=spf1 a\072shenron.openstreetmap.org include\072_spf.google.com ~all:3600
+# https://anders.com/projects/sysadmin/djbdnsRecordBuilder/
+# v=spf1 ip4:212.110.172.32 ip6:2001:41c9:1:400::32 a mx include:_spf.google.com -all
+'osmfoundation:v=spf1\040ip4\072212.110.172.32\040ip6\0722001\07241c9\0721\072400\072\07232\040a\040mx\040include\072_spf.google.com\040-all:86400
 
 # Let google handle email