Move all tile traffic to London during maintenance

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index a305955a700528fcc4aaf0948b378e10eb8291ac..b8489f2e0f99bda70d2e67b087f72472b0c11c6a 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -45,6 +45,15 @@
 +fiddlestick.ic.openstreetmap:146.179.159.163
 +fiddlestick.oob.openstreetmap:146.179.159.187
 
 +fiddlestick.ic.openstreetmap:146.179.159.163
 +fiddlestick.oob.openstreetmap:146.179.159.187
 

++bowser.openstreetmap:193.63.75.103
++openstreetmap:193.63.75.103:600
++www.openstreetmap:193.63.75.103:600
++api.openstreetmap:193.63.75.103:600
++maps.openstreetmap:193.63.75.103:600
++mapz.openstreetmap:193.63.75.103:600
++bowser.ic.openstreetmap:146.179.159.171
++bowser.oob.openstreetmap:146.179.159.180
+

 # Rails application servers
 
 +draco.ic.openstreetmap:146.179.159.165
 # Rails application servers
 
 +draco.ic.openstreetmap:146.179.159.165


@@ -60,7 +69,7 @@
 # Gazetteer (nominatim) server
 
 +poldi.openstreetmap:128.40.168.106 
 # Gazetteer (nominatim) server
 
 +poldi.openstreetmap:128.40.168.106 

-+nominatim.openstreetmap:193.63.75.98:600
++nominatim.openstreetmap:128.40.168.106:600

 +poldi.ucl.openstreetmap:10.0.0.16
 +poldi.oob.openstreetmap:10.0.1.16
 
 +poldi.ucl.openstreetmap:10.0.0.16
 +poldi.oob.openstreetmap:10.0.1.16
 


@@ -100,27 +109,19 @@
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.openstreetmap:128.40.168.104
 # 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:193.63.75.26:600
-+c.tile.openstreetmap:128.40.168.95:600
+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
 
 +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
 

-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
++london.tile.openstreetmap:193.63.75.98:3600
++sjobo.tile.openstreetmap:85.30.159.149:3600
+3sjobo.tile.openstreetmap:2a02008000003ff8020f20fffef66c09:3600

 
 # Services machine
 
 
 # Services machine
 


@@ -152,6 +153,9 @@ Csa.tile.openstreetmap:pool.tile.openstreetmap:600
 +db.ic.openstreetmap:146.179.159.168
 +smaug.oob.openstreetmap:146.179.159.182
 
 +db.ic.openstreetmap:146.179.159.168
 +smaug.oob.openstreetmap:146.179.159.182
 

++ramoth.ic.openstreetmap:146.179.159.170
++ramoth.oob.openstreetmap:146.179.159.181
+

 # Development server with wildcard alias for user sites
 
 +errol.openstreetmap:128.40.168.103
 # Development server with wildcard alias for user sites
 
 +errol.openstreetmap:128.40.168.103


@@ -173,8 +177,10 @@ Csa.tile.openstreetmap:pool.tile.openstreetmap:600
 
 +ridley.openstreetmap:128.40.168.102
 +otrs.openstreetmap:128.40.168.102
 
 +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
 +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
 +ridley.ucl.openstreetmap:10.0.0.3
 
 # Piwik server


@@ -190,6 +196,7 @@ Csa.tile.openstreetmap:pool.tile.openstreetmap:600
 +urmel.oob.openstreetmap:10.0.1.6
 +faffy.ucl.openstreetmap:10.0.0.7
 +faffy.oob.openstreetmap:10.0.1.7
 +urmel.oob.openstreetmap:10.0.1.6
 +faffy.ucl.openstreetmap:10.0.0.7
 +faffy.oob.openstreetmap:10.0.1.7

++faffy.openstreetmap:128.40.168.108

 +puff.ucl.openstreetmap:10.0.0.10
 +puff.oob.openstreetmap:10.0.1.10
 
 +puff.ucl.openstreetmap:10.0.0.10
 +puff.oob.openstreetmap:10.0.1.10
 


@@ -219,6 +226,7 @@ Csa.tile.openstreetmap:pool.tile.openstreetmap:600
 +irc.openstreetmap:89.16.179.150
 +help.openstreetmap:89.16.179.150
 +shop.openstreetmap:89.16.179.150
 +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
 +shenron.bm.openstreetmap:10.0.0.251
 
 3shenron.openstreetmap:200141c800100996021d7dfffec3df70


@@ -229,6 +237,7 @@ Csa.tile.openstreetmap:pool.tile.openstreetmap:600
 3trac.openstreetmap:200141c800100996021d7dfffec3df70
 3help.openstreetmap:200141c800100996021d7dfffec3df70
 3shop.openstreetmap:200141c800100996021d7dfffec3df70
 3trac.openstreetmap:200141c800100996021d7dfffec3df70
 3help.openstreetmap:200141c800100996021d7dfffec3df70
 3shop.openstreetmap:200141c800100996021d7dfffec3df70

+3dns.openstreetmap:200141c800100996021d7dfffec3df70

 
 # Wiki server
 
 
 # Wiki server
 


@@ -239,11 +248,14 @@ Csa.tile.openstreetmap:pool.tile.openstreetmap:600
 #+konqi.ic.openstreetmap:10.0.16.1
 #+konqi.oob.openstreetmap:10.0.17.1
 
 #+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
 
 +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)
 
 
 # Blog aggregator (on Shaun McDonald's VM)
 


@@ -259,7 +271,10 @@ Csa.tile.openstreetmap:pool.tile.openstreetmap:600
 
 # HOT site
 
 
 # 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
 
 
 # Jochen Topf's taginfo service, running on openstreetmap.de hardware