Move all tile traffic to London during maintenance

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index 22727c2b049397087395f4dececa15446202456b..b8489f2e0f99bda70d2e67b087f72472b0c11c6a 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -21,25 +21,38 @@
 
 'openstreetmap:v=spf1 ip4\07289.16.179.150 ip6\0722001\07241c8\07210\072996\07221d\0727dff\072fec3\072df70 ~all
 
 
 '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
 
 # 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
 +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
 +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.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
 
 
 # Rails application servers
 


@@ -56,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
 


@@ -71,15 +84,14 @@
 +xapi.openstreetmap:128.40.168.97
 +fafnir.ucl.openstreetmap:10.0.0.4
 
 +xapi.openstreetmap:128.40.168.97
 +fafnir.ucl.openstreetmap:10.0.0.4
 

-# OWL server
+# Tile cache server

 
 +albi.openstreetmap:128.40.168.95
 
 +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
 
 +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
 
 +azure.openstreetmap:128.40.168.100
 +jxapi.openstreetmap:128.40.168.100


@@ -87,16 +99,30 @@
 +azure.ucl.openstreetmap:10.0.0.5
 +azure.oob.openstreetmap:10.0.1.5
 
 +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
 # 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
-+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
 
 +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
 # Services machine
 
 +horntail.openstreetmap:193.63.75.101


@@ -127,6 +153,9 @@
 +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


@@ -148,13 +177,28 @@
 
 +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
 
 +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
 # Spare machines

-+fiddlestick.ucl.openstreetmap.org:10.0.0.7
-+soup.ucl.openstreetmap.org:10.0.0.8
+
++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
++faffy.openstreetmap:128.40.168.108
++puff.ucl.openstreetmap:10.0.0.10
++puff.oob.openstreetmap:10.0.1.10

 
 # APC power switches
 
 
 # APC power switches
 


@@ -182,6 +226,7 @@
 +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


@@ -192,6 +237,7 @@
 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
 


@@ -202,11 +248,14 @@
 #+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)
 


@@ -222,7 +271,10 @@
 
 # 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