Merge tuatara and waima into a single virtual cache

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index 7f2ec5fc8b95c52427ab238cfe07a11710b334aa..01fe5d5e9e7a56171bbad5a6f544116ed3397bb6 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -27,9 +27,9 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 # Publish an SPF record indicating that only shenron sends mail
 
 # https://anders.com/projects/sysadmin/djbdnsRecordBuilder/
-# v=spf1 ip4:212.110.172.32 ip6:2001:41c9:1:400::32 mx include:_spf.google.com -all
-'openstreetmap:v=spf1\040ip4\072212.110.172.32\040ip6\0722001\07241c9\0721\072400\072\07232\040mx\040include\072_spf.google.com\040-all:86400
-'otrs.openstreetmap:v=spf1\040ip4\072212.110.172.32\040ip6\0722001\07241c9\0721\072400\072\07232\040mx\040include\072_spf.google.com\040-all:86400
+# 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
 
@@ -491,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:114.23.141.203
+3tuatara.openstreetmap:24061e00b4100c24529a4cfffe79bc3b
 +waima.openstreetmap:103.197.61.160
 +nidhogg.openstreetmap:130.236.254.221
 3nidhogg.openstreetmap:200106b00017f0a000000000000000dd
@@ -503,9 +503,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