Announce MTA-STS policy

diff --git a/src/openstreetmap b/src/openstreetmap
index a505068f9262344cd995f70e1ac6b4085892ebd5..b6a99c363d341473477415e5a7156c6233711495 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -24,12 +24,6 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 
 3a.mx.openstreetmap:200141c9000104000000000000000032
 
-# Delegate MTA-STS policy for subdomains
-
-Cmta-sts.noreply.openstreetmap:mta-sts.openstreetmap
-Cmta-sts.otrs.openstreetmap:mta-sts.openstreetmap
-Cmta-sts.messages.openstreetmap:mta-sts.openstreetmap
-
 # Publish an SPF record indicating that only shenron sends mail
 
 # https://anders.com/projects/sysadmin/djbdnsRecordBuilder/
@@ -37,6 +31,16 @@ Cmta-sts.messages.openstreetmap:mta-sts.openstreetmap
 '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
+
+'_mta-sts.openstreetmap:v=STSv1;\040id=202001281902Z
+
+# 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
 
 Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com

diff --git a/src/openstreetmap-uk b/src/openstreetmap-uk
index 5b0754ac82a67378aa43749842dc9bbe785902a1..2727c5c7809ac9500e7cce39c505871b3442a491 100644 (file)
--- a/src/openstreetmap-uk
+++ b/src/openstreetmap-uk
@@ -20,6 +20,10 @@
 
 'openstreetmap-uk:v=spf1 include\072openstreetmap.org -all
 
+# Delegate MTA-STS policy
+
+C_mta-sts.openstreetmap-uk:_mta-sts.openstreetmap.org
+
 # Main web servers and their aliases
 
 +openstreetmap-uk:193.63.75.99:600
@@ -28,7 +32,6 @@
 
 Cwww.openstreetmap-uk:www.openstreetmap.org
 Capi.openstreetmap-uk:api.openstreetmap.org
-Cmta-sts.openstreetmap-uk:mta-sts.openstreetmap.org
 
 # Andy Street calendar instance
 Ccalendar.openstreetmap-uk:osmcal.street.me.uk