Update geographic tile config to use orm and gorwen

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index 66559e2f4536456eed28e0ab3f6a689e9c7344cc..8019f77580f88426edc2017b3e41ccf5bade2712 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -21,25 +21,32 @@
 
 'openstreetmap:v=spf1 ip4\07289.16.179.150 ip6\0722001\07241c8\07210\072996\07221d\0727dff\072fec3\072df70 ~all
 
+# Delegate geo.openstreetmap.org to PowerDNS
+
+&geo.openstreetmap:89.16.179.150:a.ns.openstreetmap:86400
+
 # Main web servers and their aliases
 
-+puff.openstreetmap:193.63.75.99
++soup.openstreetmap:193.63.75.99
 +openstreetmap:193.63.75.99:600
 +www.openstreetmap:193.63.75.99:600
 +api.openstreetmap:193.63.75.99:600
 +maps.openstreetmap:193.63.75.99:600
 +mapz.openstreetmap:193.63.75.99:600
-+puff.ic.openstreetmap:146.179.159.162
-+puff.oob.openstreetmap:146.179.159.188
++soup.ic.openstreetmap:146.179.159.162
++soup.oob.openstreetmap:146.179.159.188
 
-+fuchur.openstreetmap:193.63.75.100
++fiddlestick.openstreetmap:193.63.75.100
 +openstreetmap:193.63.75.100:600
 +www.openstreetmap:193.63.75.100:600
 +api.openstreetmap:193.63.75.100:600
 +maps.openstreetmap:193.63.75.100:600
 +mapz.openstreetmap:193.63.75.100:600
-+fuchur.ic.openstreetmap:146.179.159.163
-+fuchur.oob.openstreetmap:146.179.159.187
++fiddlestick.ic.openstreetmap:146.179.159.163
++fiddlestick.oob.openstreetmap:146.179.159.187
+
++bowser.ucl.openstreetmap:10.0.0.11
++bowser.oob.openstreetmap:10.0.1.11
 
 # Rails application servers
 
@@ -71,15 +78,14 @@
 +xapi.openstreetmap:128.40.168.97
 +fafnir.ucl.openstreetmap:10.0.0.4
 
-# OWL server
+# Tile cache server
 
 +albi.openstreetmap:128.40.168.95
-+owl.openstreetmap:128.40.168.95
 +albi.ilo.openstreetmap:10.0.0.52
 +albi.ucl.openstreetmap:10.0.0.2
 +albi.oob.openstreetmap:10.0.1.2
 
-# Spare server
+# JXAPI server
 
 +azure.openstreetmap:128.40.168.100
 +jxapi.openstreetmap:128.40.168.100
@@ -87,16 +93,30 @@
 +azure.ucl.openstreetmap:10.0.0.5
 +azure.oob.openstreetmap:10.0.1.5
 
+# OWL server
+
++zark.openstreetmap:128.40.168.107
++owl.openstreetmap:128.40.168107
++zark.ucl.openstreetmap:10.0.0.8
++zark.oob.openstreetmap:10.0.1.8
+
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.openstreetmap:128.40.168.104
 +tile.openstreetmap:193.63.75.26:600
 +a.tile.openstreetmap:193.63.75.26:600
-+b.tile.openstreetmap:128.40.168.95:600
++b.tile.openstreetmap:193.63.75.26:600
 +c.tile.openstreetmap:128.40.168.95: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
++sjobo.tile.openstreetmap:85.30.159.149:3600
+3sjobo.tile..openstreetmap:2a02008000003ff8020f20fffef66c09:3600
+
 # Services machine
 
 +horntail.openstreetmap:193.63.75.101
@@ -148,10 +168,28 @@
 
 +ridley.openstreetmap:128.40.168.102
 +otrs.openstreetmap:128.40.168.102
++thinkup.openstreetmap:128.40.168.102
 +blog.openstreetmap:128.40.168.102
 +foundation.openstreetmap:128.40.168.102
++tickets.openstreetmap:128.40.168.102
 +ridley.ucl.openstreetmap:10.0.0.3
 
+# Piwik server
+
++eustace.openstreetmap:128.40.168.101
++piwik.openstreetmap:128.40.168.101
++eustace.ucl.openstreetmap:10.0.0.9
++eustace.oob.openstreetmap:10.0.1.9
+
+# Spare machines
+
++urmel.ucl.openstreetmap:10.0.0.6
++urmel.oob.openstreetmap:10.0.1.6
++faffy.ucl.openstreetmap:10.0.0.7
++faffy.oob.openstreetmap:10.0.1.7
++puff.ucl.openstreetmap:10.0.0.10
++puff.oob.openstreetmap:10.0.1.10
+
 # APC power switches
 
 +apc1.ucl.openstreetmap:10.0.0.49
@@ -178,6 +216,7 @@
 +irc.openstreetmap:89.16.179.150
 +help.openstreetmap:89.16.179.150
 +shop.openstreetmap:89.16.179.150
++dns.openstreetmap:89.16.179.150
 +shenron.bm.openstreetmap:10.0.0.251
 
 3shenron.openstreetmap:200141c800100996021d7dfffec3df70
@@ -188,6 +227,7 @@
 3trac.openstreetmap:200141c800100996021d7dfffec3df70
 3help.openstreetmap:200141c800100996021d7dfffec3df70
 3shop.openstreetmap:200141c800100996021d7dfffec3df70
+3dns.openstreetmap:200141c800100996021d7dfffec3df70
 
 # Wiki server
 
@@ -198,11 +238,14 @@
 #+konqi.ic.openstreetmap:10.0.16.1
 #+konqi.oob.openstreetmap:10.0.17.1
 
-# Tile cache server
+# Tile cache servers
 
 +orm.openstreetmap:193.63.75.98
 #+orm.ic.openstreetmap:10.0.16.2
 #+orm.oob.openstreetmap:10.0.17.2
++gorwen.openstreetmap:85.30.159.149
+3gorwen.openstreetmap:2a02008000003ff8020f20fffef66c09
++gorwen.oob.openstreetmap:85.30.129.101
 
 # Blog aggregator (on Shaun McDonald's VM)
 
@@ -218,7 +261,10 @@
 
 # HOT site
 
-+hot.openstreetmap:69.163.129.108
++hot.openstreetmap:50.56.49.247
++humanitarian.openstreetmap:50.56.49.247
++hot-staging.openstreetmap:50.56.49.247
++hot-dev.openstreetmap:50.56.49.247
 
 # Jochen Topf's taginfo service, running on openstreetmap.de hardware