X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/f760750ba4168bd7845f53fef3a0af8dcfd1ac44..8f3b91181a8408719651a43f5a4d93ba331ed799:/src/openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index 9ae2283..a305955 100644
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -21,6 +21,10 @@
 
 '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
 
 +soup.openstreetmap:193.63.75.99
@@ -33,11 +37,11 @@
 +soup.oob.openstreetmap:146.179.159.188
 
 +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
++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
 +fiddlestick.ic.openstreetmap:146.179.159.163
 +fiddlestick.oob.openstreetmap:146.179.159.187
 
@@ -71,15 +75,14 @@ mapz.openstreetmap:193.63.75.100:600
 +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 @@ mapz.openstreetmap:193.63.75.100:600
 +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
@@ -98,6 +108,20 @@ mapz.openstreetmap:193.63.75.100:600
 +yevaud.ucl.openstreetmap:10.0.0.15
 +yevaud.oob.openstreetmap:10.0.1.15
 
+# Map geographic zones to tile servers
+
+Can.tile.openstreetmap:pool.tile.openstreetmap:600
+Caf.tile.openstreetmap:pool.tile.openstreetmap:600
+Cas.tile.openstreetmap:pool.tile.openstreetmap:600
+Ceu.tile.openstreetmap:pool.tile.openstreetmap:600
+Cna.tile.openstreetmap:pool.tile.openstreetmap:600
+Coc.tile.openstreetmap:pool.tile.openstreetmap:600
+Csa.tile.openstreetmap:pool.tile.openstreetmap:600
+
++pool.tile.openstreetmap:193.63.75.26:600
++pool.tile.openstreetmap:193.63.75.26:600
++pool.tile.openstreetmap:128.40.168.95:600
+
 # Services machine
 
 +horntail.openstreetmap:193.63.75.101
@@ -153,14 +177,21 @@ mapz.openstreetmap:193.63.75.100:600
 +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
-+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