Revert "Remove spike-01 from production"

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index 904737791e83ad7d7b9d93d5d537ed3584a6a2b3..2974becfdf525543c5d629954740c1945ffece01 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -13,7 +13,7 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 
 # Make the virtual machine the primary MX with Bytemark as backup
 
-@openstreetmap:212.110.172.32:a:10:600
+@openstreetmap:212.110.172.32:a:10
 @noreply.openstreetmap::a.mx.openstreetmap:10
 @otrs.openstreetmap::a.mx.openstreetmap:10
 @messages.openstreetmap::a.mx.openstreetmap:10
@@ -31,11 +31,17 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 # Delegate geo.openstreetmap.org to PowerDNS
 
 # shenron.openstreetmap.org
-&geo.openstreetmap:212.110.172.32:a.ns.openstreetmap:600
-# nadder-02.openstreetmap.org
-&geo.openstreetmap:192.163.219.40:b.ns.openstreetmap
+&geo.openstreetmap:212.110.172.32:a.ns.openstreetmap
+# saphira.openstreetmap.org
+&geo.openstreetmap:185.73.44.30:b.ns.openstreetmap
 # fume.openstreetmap.org
 &geo.openstreetmap:85.30.190.241:c.ns.openstreetmap
+# jakelong.openstreetmap.org
+&geo.openstreetmap:64.62.205.202:d.ns.openstreetmap
+# katie.openstreetmap.org
+&geo.openstreetmap:144.76.70.77:e.ns.openstreetmap
+# stormfly-02.openstreetmap.org
+&geo.openstreetmap:140.211.167.105:f.ns.openstreetmap
 
 # Main web servers and their aliases
 
@@ -111,10 +117,17 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 +poldi.oob.openstreetmap:146.179.159.186
 
 +pummelzacken.openstreetmap:128.40.45.204
-+nominatim.openstreetmap:128.40.45.204:600
+#+nominatim.openstreetmap:128.40.45.204:600
 +pummelzacken.ucl.openstreetmap:10.0.0.20
 +pummelzacken.oob.openstreetmap:10.0.1.20
 
++dulcy.openstreetmap:193.63.75.109
+3dulcy.openstreetmap:20010630001205000ec47afffe6696d2
++nominatim.openstreetmap:193.63.75.109:600
+3nominatim.openstreetmap:20010630001205000ec47afffe6696d2:600
++dulcy.ic.openstreetmap:146.179.159.179
+#+dulcy.oob.openstreetmap:
+
 # JXAPI server
 
 +norbert.openstreetmap:128.40.45.202
@@ -166,6 +179,8 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 3planet.openstreetmap:2001063000120500022590fffec4f6ef
 +logstash.openstreetmap:193.63.75.107
 3logstash.openstreetmap:2001063000120500022590fffec4f6ef
++hardware.openstreetmap:193.63.75.107
+3hardware.openstreetmap:2001063000120500022590fffec4f6ef
 +ironbelly.ic.openstreetmap:146.179.159.177
 +ironbelly.oob.openstreetmap:146.179.159.176
 +backup.ic.openstreetmap:146.179.159.177
@@ -222,9 +237,16 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 
 +grisu.openstreetmap:193.63.75.108
 3grisu.openstreetmap:2001063000120500dad385fffe5d87a0
++agri.openstreetmap:193.63.75.108:3600
++a.agri.openstreetmap:193.63.75.108:3600
++b.agri.openstreetmap:193.63.75.108:3600
++c.agri.openstreetmap:193.63.75.108:3600
 +grisu.ic.openstreetmap:146.179.159.168
 +grisu.oob.openstreetmap:146.179.159.182
 
++kessie.openstreetmap:178.250.74.36
++kessie.oob.openstreetmap:178.250.74.37
+
 # Munin server
 
 +urmel.openstreetmap:128.40.45.207
@@ -278,27 +300,27 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 
 # Bytemark machine, and the services which operate from it
 
-+shenron.openstreetmap:212.110.172.32:600
-+mail.openstreetmap:212.110.172.32:600
-+lists.openstreetmap:212.110.172.32:600
-+svn.openstreetmap:212.110.172.32:600
-+git.openstreetmap:212.110.172.32:600
-+trac.openstreetmap:212.110.172.32:600
-+irc.openstreetmap:212.110.172.32:600
-+help.openstreetmap:212.110.172.32:600
-+shop.openstreetmap:212.110.172.32:600
-+dns.openstreetmap:212.110.172.32:600
++shenron.openstreetmap:212.110.172.32
++mail.openstreetmap:212.110.172.32
++lists.openstreetmap:212.110.172.32
++svn.openstreetmap:212.110.172.32
++git.openstreetmap:212.110.172.32
++trac.openstreetmap:212.110.172.32
++irc.openstreetmap:212.110.172.32
++help.openstreetmap:212.110.172.32
++shop.openstreetmap:212.110.172.32
++dns.openstreetmap:212.110.172.32
 +shenron.bm.openstreetmap:10.0.16.3
 
-3shenron.openstreetmap:200141c9000104000000000000000032:600
-3mail.openstreetmap:200141c9000104000000000000000032:600
-3lists.openstreetmap:200141c9000104000000000000000032:600
-3svn.openstreetmap:200141c9000104000000000000000032:600
-3git.openstreetmap:200141c9000104000000000000000032:600
-3trac.openstreetmap:200141c9000104000000000000000032:600
-3help.openstreetmap:200141c9000104000000000000000032:600
-3shop.openstreetmap:200141c9000104000000000000000032:600
-3dns.openstreetmap:200141c9000104000000000000000032:600
+3shenron.openstreetmap:200141c9000104000000000000000032
+3mail.openstreetmap:200141c9000104000000000000000032
+3lists.openstreetmap:200141c9000104000000000000000032
+3svn.openstreetmap:200141c9000104000000000000000032
+3git.openstreetmap:200141c9000104000000000000000032
+3trac.openstreetmap:200141c9000104000000000000000032
+3help.openstreetmap:200141c9000104000000000000000032
+3shop.openstreetmap:200141c9000104000000000000000032
+3dns.openstreetmap:200141c9000104000000000000000032
 
 # Wiki server
 
@@ -327,6 +349,7 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 3fume.openstreetmap:2a02008000003ff8022264fffe2a2714
 +fume.oob.openstreetmap:85.30.129.98
 +gorynych.openstreetmap:130.193.62.73
+3gorynych.openstreetmap:2a0206b8b0105065000000000000a001
 +lurien.openstreetmap:193.55.222.229
 +trogdor.openstreetmap:134.90.146.26
 +trogdor.oob.openstreetmap:134.90.146.30
@@ -347,10 +370,14 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 3longma.openstreetmap:20010e10200002400000000000000007
 +viserion.openstreetmap:193.198.233.211
 3viserion.openstreetmap:20010b684cff00030000000000000003
++drogon.openstreetmap:161.53.30.107
+3drogon.openstreetmap:20010b68c0ff000002215efffe40c7c4
 +saphira.openstreetmap:185.73.44.30
 3saphira.openstreetmap:20010ba800002c1e0000000000000000
 +sarkany.openstreetmap:37.17.173.8
 3sarkany.openstreetmap:20014c480002bf04025056fffe8f5c81
++cmok.openstreetmap:31.130.201.40
+3cmok.openstreetmap:2001067c22681005021e8cfffe8c8d3b
 
 # Blog aggregator (on Shaun McDonald's VM)