X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/2e066583c54a7a3edfb799b431749529483e8d9e..92c136c904be9197783db936f54082355730d300:/src/openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index 9039dc3..9f8f2fa 100644
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -15,7 +15,7 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 
 :openstreetmap:257:\000\005\151\163\163\165\145\154\145\164\163\145\156\143\162\171\160\164\056\157\162\147
 
-# Make the virtual machine the primary MX with Bytemark as backup
+# Make the virtual machine the primary MX
 
 @openstreetmap:212.110.172.32:a:10
 @noreply.openstreetmap::a.mx.openstreetmap:10
@@ -26,8 +26,21 @@ 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 -all
+'openstreetmap:v=spf1\040ip4\072212.110.172.32\040ip6\0722001\07241c9\0721\072400\072\07232\040mx\040-all:86400
+'otrs.openstreetmap:v=spf1\040ip4\072212.110.172.32\040ip6\0722001\07241c9\0721\072400\072\07232\040mx\040-all:86400
+
+# Announce MTA-STS policy and TLSRPT policy for error reports
+
+'_mta-sts.openstreetmap:v=STSv1;\040id=202001291805Z
+'_smtp._tls.openstreetmap:v=TLSRPTv1;\040rua=mailto\072postmaster@openstreetmap.org
+
+# Delegate MTA-STS policy for subdomains
+
+C_mta-sts.noreply.openstreetmap:_mta-sts.openstreetmap
+C_mta-sts.otrs.openstreetmap:_mta-sts.openstreetmap
+C_mta-sts.messages.openstreetmap:_mta-sts.openstreetmap
 
 # Google postmaster tools verification
 
@@ -232,9 +245,9 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 +odin.ams.openstreetmap:10.0.48.15
 +odin.oob.openstreetmap:10.0.49.15
 
-+yevaud.openstreetmap:193.60.236.22
-+yevaud.ucl.openstreetmap:10.0.0.15
-+yevaud.oob.openstreetmap:10.0.1.15
++ysera.openstreetmap:193.60.236.22
++ysera.ucl.openstreetmap:10.0.0.15
++ysera.oob.openstreetmap:10.0.1.15
 
 +scorch.openstreetmap:176.31.235.79
 3scorch.openstreetmap:200141d00002fc4f0000000000000001
@@ -388,6 +401,7 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org
 
 +shenron.openstreetmap:212.110.172.32
 +mail.openstreetmap:212.110.172.32
++mta-sts.openstreetmap:212.110.172.32
 +lists.openstreetmap:212.110.172.32
 +svn.openstreetmap:212.110.172.32
 +trac.openstreetmap:212.110.172.32
@@ -489,10 +503,10 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org
 3necrosan.openstreetmap:2a0bcbc0110d0001000000000000001c
 +keizer.openstreetmap:195.201.226.63
 3keizer.openstreetmap:2a0104f81c1cbc540000000000000001
-+naga.openstreetmap:185.216.27.232
 +vipertooth.openstreetmap:176.122.99.101
 3vipertooth.openstreetmap:2001067c2d4000000000000000000065
 +tuatara.openstreetmap:114.23.141.203
+3tuatara.openstreetmap:24061e00b4100c24529a4cfffe79bc3b
 +waima.openstreetmap:103.197.61.160
 +nidhogg.openstreetmap:130.236.254.221
 3nidhogg.openstreetmap:200106b00017f0a000000000000000dd
@@ -501,8 +515,8 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org
 +fafnir.openstreetmap:130.239.18.114
 3fafnir.openstreetmap:200106b0000e2a180000000000000114
 +fume.openstreetmap:147.228.60.16
-+azure.openstreetmap:204.16.246.252
-3azure.openstreetmap:2607fdc0000100000000000000000052
++balerion.openstreetmap:138.44.68.134
++naga.openstreetmap:185.116.130.151
 
 # Blades