X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/a089b06323a1573856cc325c02c429d13afad0d2..9364d9e36c206868acc0d12a48468173267932d9:/openstreetmap.org

diff --git a/openstreetmap.org b/openstreetmap.org
index 362b0c7..265dff6 100644
--- a/openstreetmap.org
+++ b/openstreetmap.org
@@ -10,7 +10,7 @@
 
 # Make the virtual machine the primary MX with Bytemark as backup
 
-@openstreetmap.org:80.68.94.95:a:10
+@openstreetmap.org::89.16.177.88:a:10
 @openstreetmap.org::backup.mx.bytemark.co.uk:20
 
 # Main web server and it's aliases
@@ -18,11 +18,27 @@
 +openstreetmap.org:128.40.58.202
 +www.openstreetmap.org:128.40.58.202
 +api.openstreetmap.org:128.40.58.202
++maps.openstreetmap.org:128.40.58.202
++mapz.openstreetmap.org:128.40.58.202
++www.internal.openstreetmap.org:10.0.0.2
+
+# Rails application servers
+
++rails1.internal.openstreetmap.org:10.0.0.3
++rails2.internal.openstreetmap.org:10.0.0.4
+
+# Gazetteer server
+
++gazetteer.openstreetmap.org:128.40.58.201
++gazetteer.internal.openstreetmap.org:10.0.0.1
 
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
-+tile.openstreetmap.org:128.40.58.201
-+*.tile.openstreetmap.org:128.40.58.201
++tile.openstreetmap.org:128.40.58.204
++a.tile.openstreetmap.org:128.40.58.204
++b.tile.openstreetmap.org:128.40.58.204
++c.tile.openstreetmap.org:128.40.58.204
++tile.internal.openstreetmap.org:10.0.0.7
 
 # Osmarender tile server, with wildcard alias to allow parallel loading
 
@@ -31,26 +47,23 @@
 
 # Database server
 
-+db.openstreetmap.org:128.40.58.203
-
-# Old database server (currently rails application server)
-
-+db2.openstreetmap.org:128.40.58.204
++db.internal.openstreetmap.org:10.0.0.6
 
-# Backups are currently on db2
+# Backups are currently on rails2
 
-+backup.openstreetmap.org:10.0.0.3
++backup.openstreetmap.org:10.0.0.4
 
 # Development server with wildcard alias for user sites
 
 +dev.openstreetmap.org:128.40.58.205
 +*.dev.openstreetmap.org:128.40.58.205
++dev.internal.openstreetmap.org:10.0.0.5
 
 # Planet dumps are currently served from dev
 
 +planet.openstreetmap.org:128.40.58.205
 
-# Munin currently operates from tile
+# Munin currently operates from gazetteer
 
 +munin.openstreetmap.org:128.40.58.201
 
@@ -61,29 +74,30 @@
 # Bytemark virtual machine, and the services which operate from it
 
 +vm.openstreetmap.org:80.68.94.95
-+mail.openstreetmap.org:80.68.94.95
-+lists.openstreetmap.org:80.68.94.95
-+svn.openstreetmap.org:80.68.94.95
-+trac.openstreetmap.org:80.68.94.95
-#+wiki.openstreetmap.org:80.68.94.95
 +stats.wiki.openstreetmap.org:80.68.94.95
-+foundation.openstreetmap.org:80.68.94.95
-+irc.openstreetmap.org:80.68.94.95
++vm.internal.openstreetmap.org:10.0.0.253
+
+# Bytemark atom machine, and the services which operate from it
+
++idris.openstreetmap.org:89.16.177.88
++mail.openstreetmap.org:89.16.177.88
++lists.openstreetmap.org:89.16.177.88
++svn.openstreetmap.org:89.16.177.88
++trac.openstreetmap.org:89.16.177.88
+#+wiki.openstreetmap.org:89.16.177.88
++foundation.openstreetmap.org:89.16.177.88
++irc.openstreetmap.org:89.16.177.88
 
 # Wiki is currently fronted by Grant's proxy (short timeout to allow changes)
 
 +wiki.openstreetmap.org:89.145.68.232:3600
 
+# Blog aggregator (on Shaun McDonald's VM)
+
++blogs.openstreetmap.org:89.16.175.12
+
 # Our shop
 
 Cshop.openstreetmap.org:virtual.fotopic.net
 
 # Private LAN addresses for the UCL machines
-
-+tile.internal.openstreetmap.org:10.0.0.1
-+www.internal.openstreetmap.org:10.0.0.2
-+db2.internal.openstreetmap.org:10.0.0.3
-+tilegen.internal.openstreetmap.org:10.0.0.4
-+dev.internal.openstreetmap.org:10.0.0.5
-+db.internal.openstreetmap.org:10.0.0.6
-+vm.internal.openstreetmap.org:10.0.0.253