Merge tuatara and waima into a single virtual cache

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index 36a2e93ad838721958f78e125ae131c05334f497..01fe5d5e9e7a56171bbad5a6f544116ed3397bb6 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 -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
 
 # Google postmaster tools verification
 
@@ -232,9 +234,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
@@ -245,6 +247,8 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 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
@@ -406,15 +410,15 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org
 
 +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
 
 +tabaluga.openstreetmap:130.117.76.14
 3tabaluga.openstreetmap:200109780002002c000000000172000E
-#+wiki.openstreetmap:130.117.76.14:600
-#3wiki.openstreetmap:200109780002002c000000000172000E:600
++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
 
@@ -457,6 +461,8 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org
 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
@@ -485,10 +491,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:103.106.66.202
++tuatara.openstreetmap:114.23.141.203
+3tuatara.openstreetmap:24061e00b4100c24529a4cfffe79bc3b
 +waima.openstreetmap:103.197.61.160
 +nidhogg.openstreetmap:130.236.254.221
 3nidhogg.openstreetmap:200106b00017f0a000000000000000dd
@@ -496,6 +502,9 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org
 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