Add spike-02 to www and drop spike-03

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index ef7aaaf7339bf12f7cb9d2da16daeed405d7822b..bb91fe9715e14c21c5707c6435a8835c50c7fceb 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -14,7 +14,6 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 # Make the virtual machine the primary MX with Bytemark as backup
 
 @openstreetmap:89.16.179.150:a:10
-@openstreetmap::backup.mx.bytemark.co.uk:20
 @noreply.openstreetmap::a.mx.openstreetmap:10
 @otrs.openstreetmap::a.mx.openstreetmap:10
 @messages.openstreetmap::a.mx.openstreetmap:10
@@ -28,60 +27,60 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 # Delegate geo.openstreetmap.org to PowerDNS
 
 # shenron.openstreetmap.org
-&geo.openstreetmap:89.16.179.150:a.ns.openstreetmap.org
+&geo.openstreetmap:89.16.179.150:a.ns.openstreetmap
 # nadder-02.openstreetmap.org
-&geo.openstreetmap:192.163.219.40:b.ns.openstreetmap.org
+&geo.openstreetmap:192.163.219.40:b.ns.openstreetmap
 # fume.openstreetmap.org
-&geo.openstreetmap:85.30.190.241:c.ns.openstreetmap.org
+&geo.openstreetmap:85.30.190.241:c.ns.openstreetmap
 # bunyip.openstreetmap.org
-&geo.openstreetmap:203.26.72.12:d.ns.openstreetmap.org
+&geo.openstreetmap:203.26.72.12:d.ns.openstreetmap
 
 # Main web servers and their aliases
 
 +spike-01.openstreetmap:193.63.75.99
 3spike-01.openstreetmap:2001063000120500021a4bfffea5fd2a
-+openstreetmap:193.63.75.99:600
-3openstreetmap:2001063000120500021a4bfffea5fd2a:600
-+www.openstreetmap:193.63.75.99:600
-3www.openstreetmap:2001063000120500021a4bfffea5fd2a:600
-+api.openstreetmap:193.63.75.99:600
-3api.openstreetmap:2001063000120500021a4bfffea5fd2a:600
-+maps.openstreetmap:193.63.75.99:600
-3maps.openstreetmap:2001063000120500021a4bfffea5fd2a:600
-+mapz.openstreetmap:193.63.75.99:600
-3mapz.openstreetmap:2001063000120500021a4bfffea5fd2a:600
++openstreetmap:193.63.75.99:300
+3openstreetmap:2001063000120500021a4bfffea5fd2a:300
++www.openstreetmap:193.63.75.99:300
+3www.openstreetmap:2001063000120500021a4bfffea5fd2a:300
++api.openstreetmap:193.63.75.99:300
+3api.openstreetmap:2001063000120500021a4bfffea5fd2a:300
++maps.openstreetmap:193.63.75.99:300
+3maps.openstreetmap:2001063000120500021a4bfffea5fd2a:300
++mapz.openstreetmap:193.63.75.99:300
+3mapz.openstreetmap:2001063000120500021a4bfffea5fd2a:300
 +spike-01.ic.openstreetmap:146.179.159.162
 +www.ic.openstreetmap:146.179.159.162:3600
 +spike-01.oob.openstreetmap:146.179.159.188
 
 +spike-02.openstreetmap:193.63.75.100
 3spike-02.openstreetmap:20010630001205000219bbfffe393d9e
-+openstreetmap:193.63.75.100:600
-3openstreetmap:20010630001205000219bbfffe393d9e:600
-+www.openstreetmap:193.63.75.100:600
-3www.openstreetmap:20010630001205000219bbfffe393d9e:600
-+api.openstreetmap:193.63.75.100:600
-3api.openstreetmap:20010630001205000219bbfffe393d9e:600
-+maps.openstreetmap:193.63.75.100:600
-3maps.openstreetmap:20010630001205000219bbfffe393d9e:600
-+mapz.openstreetmap:193.63.75.100:600
-3mapz.openstreetmap:20010630001205000219bbfffe393d9e:600
++openstreetmap:193.63.75.100:300
+3openstreetmap:20010630001205000219bbfffe393d9e:300
++www.openstreetmap:193.63.75.100:300
+3www.openstreetmap:20010630001205000219bbfffe393d9e:300
++api.openstreetmap:193.63.75.100:300
+3api.openstreetmap:20010630001205000219bbfffe393d9e:300
++maps.openstreetmap:193.63.75.100:300
+3maps.openstreetmap:20010630001205000219bbfffe393d9e:300
++mapz.openstreetmap:193.63.75.100:300
+3mapz.openstreetmap:20010630001205000219bbfffe393d9e:300
 +spike-02.ic.openstreetmap:146.179.159.163
 +www.ic.openstreetmap:146.179.159.163:3600
 +spike-02.oob.openstreetmap:146.179.159.180
 
 +spike-03.openstreetmap:193.63.75.103
 3spike-03.openstreetmap:20010630001205000219bbfffe398aba
-+openstreetmap:193.63.75.103:600
-3openstreetmap:20010630001205000219bbfffe398aba:600
-+www.openstreetmap:193.63.75.103:600
-3www.openstreetmap:20010630001205000219bbfffe398aba:600
-+api.openstreetmap:193.63.75.103:600
-3api.openstreetmap:20010630001205000219bbfffe398aba:600
-+maps.openstreetmap:193.63.75.103:600
-3maps.openstreetmap:20010630001205000219bbfffe398aba:600
-+mapz.openstreetmap:193.63.75.103:600
-3mapz.openstreetmap:20010630001205000219bbfffe398aba:600
+#+openstreetmap:193.63.75.103:300
+#3openstreetmap:20010630001205000219bbfffe398aba:300
+#+www.openstreetmap:193.63.75.103:300
+#3www.openstreetmap:20010630001205000219bbfffe398aba:300
+#+api.openstreetmap:193.63.75.103:300
+#3api.openstreetmap:20010630001205000219bbfffe398aba:300
+#+maps.openstreetmap:193.63.75.103:300
+#3maps.openstreetmap:20010630001205000219bbfffe398aba:300
+#+mapz.openstreetmap:193.63.75.103:300
+#3mapz.openstreetmap:20010630001205000219bbfffe398aba:300
 +spike-03.ic.openstreetmap:146.179.159.171
 +www.ic.openstreetmap:146.179.159.171:3600
 +spike-03.oob.openstreetmap:146.179.159.187
@@ -139,11 +138,6 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 
 # Services machine
 
-+horntail.openstreetmap:193.63.75.101
-3horntail.openstreetmap:20010630001205000202b3fffeeceeac
-+horntail.ic.openstreetmap:146.179.159.164
-+horntail.oob.openstreetmap:146.179.159.186
-
 +ironbelly.openstreetmap:193.63.75.107
 3ironbelly.openstreetmap:2001063000120500022590fffec4f6ef
 +chef.openstreetmap:193.63.75.107
@@ -158,7 +152,7 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 +ironbelly.oob.openstreetmap:146.179.159.176
 +backup.ic.openstreetmap:146.179.159.177
 
-# Database server
+# Database servers
 
 +smaug.ic.openstreetmap:146.179.159.168
 +smaug.oob.openstreetmap:146.179.159.182
@@ -280,19 +274,25 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 
 # Wiki server
 
-+konqi.openstreetmap:193.63.75.104
-3konqi.openstreetmap:2001063000120500021560fffeaa9956
-+konqi.ilo.openstreetmap:146.179.159.179
-+wiki.openstreetmap:193.63.75.104:600
-+dump.wiki.openstreetmap:193.63.75.104:600
-#+konqi.ic.openstreetmap:10.0.16.1
-#+konqi.oob.openstreetmap:10.0.17.1
-
 +ouroboros.openstreetmap:193.63.75.106
 3ouroboros.openstreetmap:200106300012050002237dfffeea813a
++wiki.openstreetmap:193.63.75.106:600
 +ouroboros.ic.openstreetmap:146.179.159.172
 +ouroboros.oob.openstreetmap:146.179.159.178
 
+# GPS tile server
+
++noquiklos.openstreetmap:128.40.168.99
++gps.tile.openstreetmap:128.40.168.99
++gps-a.tile.openstreetmap:128.40.168.99
++gps-b.tile.openstreetmap:128.40.168.99
++gps-c.tile.openstreetmap:128.40.168.99
++a.gps-tile.openstreetmap:128.40.168.99
++b.gps-tile.openstreetmap:128.40.168.99
++c.gps-tile.openstreetmap:128.40.168.99
++noquiklos.ucl.openstreetmap:10.0.0.13
++noquiklos.oob.openstreetmap:10.0.1.13
+
 # Tile cache servers
 
 +fume.openstreetmap:85.30.190.241
@@ -307,10 +307,10 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 +ridgeback.openstreetmap:31.169.50.10
 +ridgeback.oob.openstreetmap:31.169.50.14
 +jakelong.openstreetmap:64.62.205.202
+3jakelong.openstreetmap:2001047000010041a80000fffe3ecdca
 +nepomuk.openstreetmap:77.95.70.166
-3nepomuk.openstreetmap:200107f80047002100000000000000a6
-+grisu.openstreetmap:142.4.213.166
-3grisu.openstreetmap:26075300006012a60000000000000001
+3nepomuk.openstreetmap:2a0391800001002100000000000000a6
+
 +tabaluga.openstreetmap:5.9.150.236
 3tabaluga.openstreetmap:2a0104f8019033eb0000000000000002
 +nadder-01.openstreetmap:192.163.219.36