Adjust geographic mappings for tile

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index 93219bd169e25c33c3e5b8361bff9b51867babb8..6956f37dd568c89d3661ab122bda33f7979674bc 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -21,16 +21,20 @@
 
 '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
 
 +fiddlestick.openstreetmap:193.63.75.100
 +openstreetmap:193.63.75.100:600
@@ -71,15 +75,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,6 +90,13 @@
 +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
@@ -94,9 +104,16 @@
 +a.tile.openstreetmap:193.63.75.26: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.26:3600
++london.tile.openstreetmap:193.63.75.26:3600
++london.tile.openstreetmap:128.40.168.95:3600
+
 # Services machine
 
 +horntail.openstreetmap:193.63.75.101
@@ -152,16 +169,21 @@
 +foundation.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
-+soup.ucl.openstreetmap:10.0.0.8
-+soup.oob.openstreetmap:10.0.1.8
-+eustace.ucl.openstreetmap:10.0.0.9
-+eustace.oob.openstreetmap:10.0.1.9
++puff.ucl.openstreetmap:10.0.0.10
++puff.oob.openstreetmap:10.0.1.10
 
 # APC power switches