X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/ec2f892cab56800b0262fff0e87084a35a36b222..e51d612d7ab9c017d1f460aff4db4024bacf0d29:/openstreetmap.org?ds=sidebyside

diff --git a/openstreetmap.org b/openstreetmap.org
index ab08f6d..ef42a69 100644
--- a/openstreetmap.org
+++ b/openstreetmap.org
@@ -18,21 +18,26 @@
 +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
 
-# Old mapnik tile server
+# Rails application servers
 
-+oldtile.openstreetmap.org:128.40.58.201:3600
-+oldtile.internal.openstreetmap.org:10.0.0.1:3600
++rails1.internal.openstreetmap.org:10.0.0.3
++rails2.internal.openstreetmap.org:10.0.0.4
 
-# Mapnik tilegen server
+# Gazetteer server
 
-+tilegen.internal.openstreetmap.org:10.0.0.4
++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.204:3600
-+*.tile.openstreetmap.org:128.40.58.204:3600
++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
@@ -44,13 +49,9 @@
 
 +db.internal.openstreetmap.org:10.0.0.6
 
-# Old database server (currently rails application server)
+# Backups are currently on rails2
 
-+db2.internal.openstreetmap.org:10.0.0.3
-
-# Backups are currently on db2
-
-+backup.openstreetmap.org:10.0.0.3
++backup.openstreetmap.org:10.0.0.4
 
 # Development server with wildcard alias for user sites
 
@@ -62,7 +63,7 @@
 
 +planet.openstreetmap.org:128.40.58.205
 
-# Munin currently operates from tile
+# Munin currently operates from gazetteer
 
 +munin.openstreetmap.org:128.40.58.201