Send nominatim traffic through geodns

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index 90702e804223496abf4cbd4e3baf1cc3d3f72424..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
 
 
 :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
 
 @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
 
 
 # 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
 
 
 # Google postmaster tools verification
 


@@ -46,6 +59,8 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 &geo.openstreetmap:144.76.70.77:d.ns.openstreetmap
 # stormfly-02.openstreetmap.org
 &geo.openstreetmap:140.211.167.105:e.ns.openstreetmap
 &geo.openstreetmap:144.76.70.77:d.ns.openstreetmap
 # stormfly-02.openstreetmap.org
 &geo.openstreetmap:140.211.167.105:e.ns.openstreetmap

+# chrysophylax.openstreetmap.org
+&geo.openstreetmap:217.71.244.22:f.ns.openstreetmap

 
 # Main web servers and their aliases
 
 
 # Main web servers and their aliases
 


@@ -66,31 +81,31 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 
 +spike-02.openstreetmap:130.117.76.7
 3spike-02.openstreetmap:200109780002002c0000000001720007
 
 +spike-02.openstreetmap:130.117.76.7
 3spike-02.openstreetmap:200109780002002c0000000001720007

-+openstreetmap:130.117.76.7:600
-3openstreetmap:200109780002002c0000000001720007:600
-+www.openstreetmap:130.117.76.7:600
-3www.openstreetmap:200109780002002c0000000001720007:600
-+api.openstreetmap:130.117.76.7:600
-3api.openstreetmap:200109780002002c0000000001720007:600
-+maps.openstreetmap:130.117.76.7:600
-3maps.openstreetmap:200109780002002c0000000001720007:600
-+mapz.openstreetmap:130.117.76.7:600
-3mapz.openstreetmap:200109780002002c0000000001720007:600
+#+openstreetmap:130.117.76.7:600
+#3openstreetmap:200109780002002c0000000001720007:600
+#+www.openstreetmap:130.117.76.7:600
+#3www.openstreetmap:200109780002002c0000000001720007:600
+#+api.openstreetmap:130.117.76.7:600
+#3api.openstreetmap:200109780002002c0000000001720007:600
+#+maps.openstreetmap:130.117.76.7:600
+#3maps.openstreetmap:200109780002002c0000000001720007:600
+#+mapz.openstreetmap:130.117.76.7:600
+#3mapz.openstreetmap:200109780002002c0000000001720007:600

 +spike-02.ams.openstreetmap:10.0.48.7
 +spike-02.oob.openstreetmap:10.0.49.7
 
 +spike-03.openstreetmap:130.117.76.8
 3spike-03.openstreetmap:200109780002002c0000000001720008
 +spike-02.ams.openstreetmap:10.0.48.7
 +spike-02.oob.openstreetmap:10.0.49.7
 
 +spike-03.openstreetmap:130.117.76.8
 3spike-03.openstreetmap:200109780002002c0000000001720008

-+openstreetmap:130.117.76.8:600
-3openstreetmap:200109780002002c0000000001720008:600
-+www.openstreetmap:130.117.76.8:600
-3www.openstreetmap:200109780002002c0000000001720008:600
-+api.openstreetmap:130.117.76.8:600
-3api.openstreetmap:200109780002002c0000000001720008:600
-+maps.openstreetmap:130.117.76.8:600
-3maps.openstreetmap:200109780002002c0000000001720008:600
-+mapz.openstreetmap:130.117.76.8:600
-3mapz.openstreetmap:200109780002002c0000000001720008:600
+#+openstreetmap:130.117.76.8:600
+#3openstreetmap:200109780002002c0000000001720008:600
+#+www.openstreetmap:130.117.76.8:600
+#3www.openstreetmap:200109780002002c0000000001720008:600
+#+api.openstreetmap:130.117.76.8:600
+#3api.openstreetmap:200109780002002c0000000001720008:600
+#+maps.openstreetmap:130.117.76.8:600
+#3maps.openstreetmap:200109780002002c0000000001720008:600
+#+mapz.openstreetmap:130.117.76.8:600
+#3mapz.openstreetmap:200109780002002c0000000001720008:600

 +spike-03.ams.openstreetmap:10.0.48.8
 +spike-03.oob.openstreetmap:10.0.49.8
 
 +spike-03.ams.openstreetmap:10.0.48.8
 +spike-03.oob.openstreetmap:10.0.49.8
 


@@ -124,6 +139,51 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 +spike-05.bm.openstreetmap:10.0.32.22
 +spike-05.oob.openstreetmap:10.0.33.22
 
 +spike-05.bm.openstreetmap:10.0.32.22
 +spike-05.oob.openstreetmap:10.0.33.22
 

++spike-06.openstreetmap:130.117.76.11
+3spike-06.openstreetmap:200109780002002c000000000172000B
++openstreetmap:130.117.76.11:600
+3openstreetmap:200109780002002c000000000172000B:600
++www.openstreetmap:130.117.76.11:600
+3www.openstreetmap:200109780002002c000000000172000B:600
++api.openstreetmap:130.117.76.11:600
+3api.openstreetmap:200109780002002c000000000172000B:600
++maps.openstreetmap:130.117.76.11:600
+3maps.openstreetmap:200109780002002c000000000172000B:600
++mapz.openstreetmap:130.117.76.11:600
+3mapz.openstreetmap:200109780002002c000000000172000B:600
++spike-06.ams.openstreetmap:10.0.48.11
++spike-06.oob.openstreetmap:10.0.49.11
+
++spike-07.openstreetmap:130.117.76.12
+3spike-07.openstreetmap:200109780002002c000000000172000C
++openstreetmap:130.117.76.12:600
+3openstreetmap:200109780002002c000000000172000C:600
++www.openstreetmap:130.117.76.12:600
+3www.openstreetmap:200109780002002c000000000172000C:600
++api.openstreetmap:130.117.76.12:600
+3api.openstreetmap:200109780002002c000000000172000C:600
++maps.openstreetmap:130.117.76.12:600
+3maps.openstreetmap:200109780002002c000000000172000C:600
++mapz.openstreetmap:130.117.76.12:600
+3mapz.openstreetmap:200109780002002c000000000172000C:600
++spike-07.ams.openstreetmap:10.0.48.12
++spike-07.oob.openstreetmap:10.0.49.12
+
++spike-08.openstreetmap:130.117.76.13
+3spike-08.openstreetmap:200109780002002c000000000172000D
++openstreetmap:130.117.76.13:600
+3openstreetmap:200109780002002c000000000172000D:600
++www.openstreetmap:130.117.76.13:600
+3www.openstreetmap:200109780002002c000000000172000D:600
++api.openstreetmap:130.117.76.13:600
+3api.openstreetmap:200109780002002c000000000172000D:600
++maps.openstreetmap:130.117.76.13:600
+3maps.openstreetmap:200109780002002c000000000172000D:600
++mapz.openstreetmap:130.117.76.13:600
+3mapz.openstreetmap:200109780002002c000000000172000D:600
++spike-08.ams.openstreetmap:10.0.48.13
++spike-08.oob.openstreetmap:10.0.49.13
+

 # Rails application servers
 
 +thorn-01.ams.openstreetmap:10.0.48.51
 # Rails application servers
 
 +thorn-01.ams.openstreetmap:10.0.48.51


@@ -180,9 +240,14 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 +orm.ams.openstreetmap:10.0.48.3
 +orm.oob.openstreetmap:10.0.49.3
 
 +orm.ams.openstreetmap:10.0.48.3
 +orm.oob.openstreetmap:10.0.49.3
 

-+yevaud.openstreetmap:193.60.236.22
-+yevaud.ucl.openstreetmap:10.0.0.15
-+yevaud.oob.openstreetmap:10.0.1.15
++odin.openstreetmap:130.117.76.15
+3odin.openstreetmap:200109780002002c000000000172000F
++odin.ams.openstreetmap:10.0.48.15
++odin.oob.openstreetmap:10.0.49.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
 
 +scorch.openstreetmap:176.31.235.79
 3scorch.openstreetmap:200141d00002fc4f0000000000000001


@@ -193,6 +258,8 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 3pyrene.openstreetmap:2605bc8030100700000000008cd3a762
 +pyrene.oob.openstreetmap:10.0.0.40
 
 3pyrene.openstreetmap:2605bc8030100700000000008cd3a762
 +pyrene.oob.openstreetmap:10.0.0.40
 

++bowser.openstreetmap:138.44.68.106
+

 Ctile.openstreetmap:tile.geo.openstreetmap.org
 Ca.tile.openstreetmap:tile.geo.openstreetmap.org
 Cb.tile.openstreetmap:tile.geo.openstreetmap.org
 Ctile.openstreetmap:tile.geo.openstreetmap.org
 Ca.tile.openstreetmap:tile.geo.openstreetmap.org
 Cb.tile.openstreetmap:tile.geo.openstreetmap.org


@@ -206,8 +273,6 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org
 3backup.openstreetmap:200109780002002c000000000172000a:600
 +planet.openstreetmap:130.117.76.10:600
 3planet.openstreetmap:200109780002002c000000000172000a:600
 3backup.openstreetmap:200109780002002c000000000172000a:600
 +planet.openstreetmap:130.117.76.10:600
 3planet.openstreetmap:200109780002002c000000000172000a:600

-+stats.openstreetmap:130.117.76.10
-3stats.openstreetmap:200109780002002c000000000172000a

 +logstash.openstreetmap:130.117.76.10
 3logstash.openstreetmap:200109780002002c000000000172000a
 +ironbelly.ams.openstreetmap:10.0.48.10
 +logstash.openstreetmap:130.117.76.10
 3logstash.openstreetmap:200109780002002c000000000172000a
 +ironbelly.ams.openstreetmap:10.0.48.10


@@ -236,8 +301,6 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org
 +ramoth.ams.openstreetmap:10.0.48.5
 +ramoth.oob.openstreetmap:10.0.49.5
 
 +ramoth.ams.openstreetmap:10.0.48.5
 +ramoth.oob.openstreetmap:10.0.49.5
 

-+fafnir.openstreetmap:52.50.86.69
-

 # Development server with wildcard alias for user sites
 
 +errol.openstreetmap:193.60.236.13
 # Development server with wildcard alias for user sites
 
 +errol.openstreetmap:193.60.236.13


@@ -338,6 +401,7 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org
 
 +shenron.openstreetmap:212.110.172.32
 +mail.openstreetmap:212.110.172.32
 
 +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
 +lists.openstreetmap:212.110.172.32
 +svn.openstreetmap:212.110.172.32
 +trac.openstreetmap:212.110.172.32


@@ -358,11 +422,18 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org
 
 +ouroboros.openstreetmap:130.117.76.4
 3ouroboros.openstreetmap:200109780002002c0000000001720004
 
 +ouroboros.openstreetmap:130.117.76.4
 3ouroboros.openstreetmap:200109780002002c0000000001720004

-+wiki.openstreetmap:130.117.76.4:600
-3wiki.openstreetmap:200109780002002c0000000001720004:600
+#+wiki.openstreetmap:130.117.76.4:600
+#3wiki.openstreetmap:200109780002002c0000000001720004:600

 +ouroboros.ams.openstreetmap:10.0.48.4
 +ouroboros.oob.openstreetmap:10.0.49.4
 
 +ouroboros.ams.openstreetmap:10.0.48.4
 +ouroboros.oob.openstreetmap:10.0.49.4
 

++tabaluga.openstreetmap:130.117.76.14
+3tabaluga.openstreetmap:200109780002002c000000000172000E
++wiki.openstreetmap:130.117.76.14:600
+3wiki.openstreetmap:200109780002002c000000000172000E:600
++tabaluga.ams.openstreetmap:10.0.48.14
++tabaluga.oob.openstreetmap:10.0.49.14
+

 # GPS tile server
 
 +noquiklos.openstreetmap:193.60.236.16
 # GPS tile server
 
 +noquiklos.openstreetmap:193.60.236.16


@@ -402,6 +473,8 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org
 3drogon.openstreetmap:20010b68c0ff000002215efffe40c7c4
 +saphira.openstreetmap:185.73.44.30
 3saphira.openstreetmap:20010ba800002c1e0000000000000000
 3drogon.openstreetmap:20010b68c0ff000002215efffe40c7c4
 +saphira.openstreetmap:185.73.44.30
 3saphira.openstreetmap:20010ba800002c1e0000000000000000

++toothless.openstreetmap:185.73.44.167
+3toothless.openstreetmap:20010ba800002ca70000000000000000

 +sarkany.openstreetmap:37.17.173.8
 3sarkany.openstreetmap:20014c480002bf04025056fffe8f5c81
 +cmok.openstreetmap:31.130.201.40
 +sarkany.openstreetmap:37.17.173.8
 3sarkany.openstreetmap:20014c480002bf04025056fffe8f5c81
 +cmok.openstreetmap:31.130.201.40


@@ -430,7 +503,20 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org
 3necrosan.openstreetmap:2a0bcbc0110d0001000000000000001c
 +keizer.openstreetmap:195.201.226.63
 3keizer.openstreetmap:2a0104f81c1cbc540000000000000001
 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
++boitata.openstreetmap:200.236.31.207
+3boitata.openstreetmap:2801008280ff80020216ccfffeaa0021
++fafnir.openstreetmap:130.239.18.114
+3fafnir.openstreetmap:200106b0000e2a180000000000000114
++fume.openstreetmap:147.228.60.16
++balerion.openstreetmap:138.44.68.134
++naga.openstreetmap:185.116.130.151

 
 # Blades
 
 
 # Blades