X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/76377cfc74428e268909675d4928a3f6988323b0..31ca01e589d57c4145cf37f73c888c6f10cf7825:/src/openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index 0ce7326..443d5a8 100644
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -24,9 +24,14 @@
 
 # Delegate geo.openstreetmap.org to PowerDNS
 
-&geo.openstreetmap:89.16.179.150:a.ns.openstreetmap:3600
-&geo.openstreetmap:193.63.75.98:b.ns.openstreetmap:3600
-&geo.openstreetmap:85.30.190.241:c.ns.openstreetmap:3600
+# shenron.openstreetmap.org
+&geo.openstreetmap:89.16.179.150:a.ns.openstreetmap
+# nadder-02.openstreetmap.org
+&geo.openstreetmap:192.163.219.40:b.ns.openstreetmap
+# fume.openstreetmap.org
+&geo.openstreetmap:85.30.190.241:c.ns.openstreetmap
+# bunyip.openstreetmap.org
+&geo.openstreetmap:203.26.72.12:d.ns.openstreetmap
 
 # Main web servers and their aliases
 
@@ -116,51 +121,40 @@
 
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
++orm.openstreetmap:193.63.75.98
+3orm.openstreetmap:200106300012050002e081fffec52a8c
+#+orm.ic.openstreetmap:10.0.16.2
++orm.oob.openstreetmap:146.179.159.175
 +yevaud.openstreetmap:128.40.168.104
-Ctile.openstreetmap:tile.geo.openstreetmap.org:600
-Ca.tile.openstreetmap:tile.geo.openstreetmap.org:600
-Cb.tile.openstreetmap:tile.geo.openstreetmap.org:600
-Cc.tile.openstreetmap:tile.geo.openstreetmap.org:600
-+parent.tile.openstreetmap:128.40.168.104:300
 +yevaud.ucl.openstreetmap:10.0.0.15
 +yevaud.oob.openstreetmap:10.0.1.15
-
-# Map geographic zones to tile servers
-
-+london.tile.openstreetmap:193.63.75.98:3600
-# 3london.openstreetmap:200106300012050002e081fffec52a8c:3600
-+sjobo.tile.openstreetmap:85.30.190.241:3600
-# 3sjobo.tile.openstreetmap:2a02008000003ff8022264fffe2a2714:3600
-+moscow.tile.openstreetmap:130.193.62.73:3600
-+brisbane.tile.openstreetmap:203.26.72.12:3600
-# 3brisbane.tile.openstreetmap:2402640000010006021708fffe5640c3:3600
-+pau.tile.openstreetmap:193.55.222.229:3600
-+amsterdam.tile.openstreetmap:134.90.146.26:3600
-+oslo.tile.openstreetmap:31.169.50.10:3600
-+sanfrancisco.tile.openstreetmap:64.62.205.202:3600
-+lyon.tile.openstreetmap:77.95.70.166:3600
-# 3lyon.openstreetmap:200107f80047002100000000000000a6:3600
-+beauharnois.tile.openstreetmap:142.4.213.166:3600
-# 3beauharnois.tile.openstreetmap:26075300006012a60000000000000001:3600
-+falkenstein.tile.openstreetmap:5.9.150.236:3600
-# 3falkenstein.openstreetmap:2a0104f8019033eb0000000000000002:3600
+Ctile.openstreetmap:tile.geo.openstreetmap.org:3600
+Ca.tile.openstreetmap:tile.geo.openstreetmap.org:3600
+Cb.tile.openstreetmap:tile.geo.openstreetmap.org:3600
+Cc.tile.openstreetmap:tile.geo.openstreetmap.org:3600
+Cparent.tile.openstreetmap:render.openstreetmap.org
 
 # Services machine
 
 +horntail.openstreetmap:193.63.75.101
 3horntail.openstreetmap:20010630001205000202b3fffeeceeac
-+planet.openstreetmap:193.63.75.101
-3planet.openstreetmap:20010630001205000202b3fffeeceeac
-+stats.openstreetmap:193.63.75.101
-3stats.openstreetmap:20010630001205000202b3fffeeceeac
-+chef.openstreetmap:193.63.75.101
-3chef.openstreetmap:20010630001205000202b3fffeeceeac
-+backup.openstreetmap:193.63.75.101
-3backup.openstreetmap:20010630001205000202b3fffeeceeac
 +horntail.ic.openstreetmap:146.179.159.164
 +backup.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
+3chef.openstreetmap:2001063000120500022590fffec4f6ef
++backup.openstreetmap:193.63.75.107
+3backup.openstreetmap:2001063000120500022590fffec4f6ef
++stats.openstreetmap:193.63.75.107
+3stats.openstreetmap:2001063000120500022590fffec4f6ef
++planet.openstreetmap:193.63.75.107
+3planet.openstreetmap:2001063000120500022590fffec4f6ef
++ironbelly.ic.openstreetmap:146.179.159.177
++ironbelly.oob.openstreetmap:146.179.159.176
+
 # Database server
 
 +smaug.ic.openstreetmap:146.179.159.168
@@ -298,10 +292,6 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org:600
 
 # Tile cache servers
 
-+orm.openstreetmap:193.63.75.98
-3orm.openstreetmap:200106300012050002e081fffec52a8c
-#+orm.ic.openstreetmap:10.0.16.2
-#+orm.oob.openstreetmap:10.0.17.2
 +fume.openstreetmap:85.30.190.241
 3fume.openstreetmap:2a02008000003ff8022264fffe2a2714
 +fume.oob.openstreetmap:85.30.129.98
@@ -320,6 +310,8 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org:600
 3grisu.openstreetmap:26075300006012a60000000000000001
 +tabaluga.openstreetmap:5.9.150.236
 3tabaluga.openstreetmap:2a0104f8019033eb0000000000000002
++nadder-01.openstreetmap:192.163.219.36
++nadder-02.openstreetmap:192.163.219.40
 
 # Blog aggregator (on Shaun McDonald's VM)
 
@@ -327,8 +319,8 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org:600
 
 # Continuous integration server (on Shaun McDonald's machine)
 
-+ci.openstreetmap:5.9.72.139
-+cruise.openstreetmap:5.9.72.139
++ci.openstreetmap:144.76.98.136
++cruise.openstreetmap:144.76.98.136
  
 # Donation site