Reorganise servers.

[dns.git] / openstreetmap.org

diff --git a/openstreetmap.org b/openstreetmap.org
index c23210cd3b529577ee0a180d67cfac54cd92eacf..2f80bdc7b96e14d1e645a13ad6c28abda6c5695c 100644 (file)
--- a/openstreetmap.org
+++ b/openstreetmap.org
@@ -18,11 +18,23 @@
 +openstreetmap.org:128.40.58.202
 +www.openstreetmap.org:128.40.58.202
 +api.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:3600
++gazetteer.internal.openstreetmap.org:10.0.0.1:3600
 
 # 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:3600
++*.tile.openstreetmap.org:128.40.58.204:3600
++tile.internal.openstreetmap.org:10.0.0.7
 
 # Osmarender tile server, with wildcard alias to allow parallel loading
 
@@ -31,20 +43,17 @@
 
 # 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 rails1
 
-+backup.openstreetmap.org:128.40.58.204
++backup.openstreetmap.org:10.0.0.3
 
 # 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
 
@@ -69,6 +78,7 @@
 +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
 
 # Wiki is currently fronted by Grant's proxy (short timeout to allow changes)
 
@@ -79,10 +89,3 @@
 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