Make maps an alias for www.

[dns.git] / openstreetmap.org

diff --git a/openstreetmap.org b/openstreetmap.org
index 274398c8af4d04524d7b69061272dd47db864046..ef42a69b8353036c82953fa2260d63fa32f20315 100644 (file)
--- a/openstreetmap.org
+++ b/openstreetmap.org
@@ -18,21 +18,27 @@
 +openstreetmap.org:128.40.58.202
 +www.openstreetmap.org:128.40.58.202
 +api.openstreetmap.org:128.40.58.202
 +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
 
 +www.internal.openstreetmap.org:10.0.0.2
 

-# Mapnik tile server, with wildcard alias to allow parallel loading
+# Rails application servers

 
 

-+tile.openstreetmap.org:128.40.58.201
-+*.tile.openstreetmap.org:128.40.58.201
-+tile.internal.openstreetmap.org:10.0.0.1
++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

 
 

-# New apnik tile server
+# Mapnik tile server, with wildcard alias to allow parallel loading

 
 

-+tileserv.internal.openstreetmap.org:10.0.0.7
++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
 
 
 # Osmarender tile server, with wildcard alias to allow parallel loading
 


@@ -43,13 +49,9 @@
 
 +db.internal.openstreetmap.org:10.0.0.6
 
 
 +db.internal.openstreetmap.org:10.0.0.6
 

-# Old database server (currently rails application server)
-
-+db2.internal.openstreetmap.org:10.0.0.3
-
-# 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
 
 
 # Development server with wildcard alias for user sites
 


@@ -61,7 +63,7 @@
 
 +planet.openstreetmap.org:128.40.58.205
 
 
 +planet.openstreetmap.org:128.40.58.205
 

-# Munin currently operates from tile
+# Munin currently operates from gazetteer

 
 +munin.openstreetmap.org:128.40.58.201
 
 
 +munin.openstreetmap.org:128.40.58.201