Send nominatim traffic through geodns

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index cb6ec0da0470c51eeeac0697a389c22ba96a07ff..9f8f2fa164697203bb61345ea6bfebd7c155c839 100644 (file)
--- 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
@@ -31,6 +31,17 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 '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
 
 Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
@@ -198,14 +209,14 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 # Nominatim servers
 
 +pummelzacken.openstreetmap:193.60.236.18
-+nominatim.openstreetmap:193.60.236.18:600
+#+nominatim.openstreetmap:193.60.236.18:600
 +pummelzacken.ucl.openstreetmap:10.0.0.20
 +pummelzacken.oob.openstreetmap:10.0.1.20
 
 +dulcy.openstreetmap:130.117.76.9
 3dulcy.openstreetmap:200109780002002c0000000001720009
-#+nominatim.openstreetmap:130.117.76.9:600
-#3nominatim.openstreetmap:200109780002002c0000000001720009:600
++nominatim.openstreetmap:130.117.76.9:600
+3nominatim.openstreetmap:200109780002002c0000000001720009:600
 +dulcy.ams.openstreetmap:10.0.48.9
 +dulcy.oob.openstreetmap:10.0.49.9
 
@@ -390,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
@@ -494,6 +506,7 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org
 +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