Move forum to new home.

[dns.git] / openstreetmap.org

diff --git a/openstreetmap.org b/openstreetmap.org
index 44a3618f832b9985bf40273b828e93e08e0b99c5..5f9f8997690840c7d9a93c1177f2fe5b816c4c1e 100644 (file)
--- a/openstreetmap.org
+++ b/openstreetmap.org
@@ -53,17 +53,22 @@
 
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
-+tile.openstreetmap.org:128.40.168.99
-+a.tile.openstreetmap.org:128.40.168.99
-+b.tile.openstreetmap.org:128.40.168.99
-+c.tile.openstreetmap.org:128.40.168.99
-+tile.internal.openstreetmap.org:10.0.0.7
-+tile.ilo.openstreetmap.org:10.1.0.7
-
 +yevaud.openstreetmap.org:128.40.168.104
++tile.openstreetmap.org:128.40.168.104
++a.tile.openstreetmap.org:128.40.168.104
++b.tile.openstreetmap.org:128.40.168.104
++c.tile.openstreetmap.org:128.40.168.104
 +yevaud.internal.openstreetmap.org:10.0.0.15
 +yevaud.ilo.openstreetmap.org:10.0.0.65
 
+# Services machine
+
++horntail.openstreetmap.org:128.40.168.99
++munin.openstreetmap.org:128.40.168.99
++backup.openstreetmap.org:10.0.0.7
++horntail.internal.openstreetmap.org:10.0.0.7
++horntail.ilo.openstreetmap.org:10.1.0.7
+
 # Osmarender tile server, with wildcard alias to allow parallel loading
 
 +tah.openstreetmap.org:129.132.168.206
@@ -81,10 +86,6 @@
 +db.internal.openstreetmap.org:10.0.0.13:60
 +smaug.ilo.internal.openstreetmap.org:10.0.0.63
 
-# Backups are currently on tile
-
-+backup.openstreetmap.org:10.0.0.7
-
 # Development server with wildcard alias for user sites
 
 +old-dev.openstreetmap.org:128.40.168.100
@@ -97,24 +98,24 @@
 +new-dev.openstreetmap.org:128.40.168.103
 +*.new-dev.openstreetmap.org:128.40.168.103
 +npe.openstreetmap.org:128.40.168.103
-+errol.internal.openstreetmap.org:10.0.0.14
 +errol.ilo.openstreetmap.org:10.0.0.64
 
-# Planet dumps are currently served from dev
+# Foundation server
 
-+planet.openstreetmap.org:128.40.168.100
++ridley.openstreetmap.org:128.40.168.102
++otrs.openstreetmap.org:128.40.168.102
++foundation.openstreetmap.org:128.40.168.102
++ridley.internal.openstreetmap.org:10.0.0.3
 
-# Munin currently operates from gazetteer
+# Planet dumps are currently served from dev
 
-+munin.openstreetmap.org:128.40.168.96
++planet.openstreetmap.org:128.40.168.100
 
 # Spare servers
 
 +fuchur.internal.openstreetmap.org:10.0.0.9
 +fuchur.ilo.openstreetmap.org:10.0.0.59
 +dulcy.internal.openstreetmap.org:10.0.0.2
-+ridley.openstreetmap.org:128.40.168.102
-+ridley.internal.openstreetmap.org:10.0.0.3
 +katie.openstreetmap.org:128.40.168.101
 +katie.internal.openstreetmap.org:10.0.0.6
 
@@ -124,7 +125,7 @@
 
 # Forum server
 
-+forum.openstreetmap.org:87.239.8.25
++forum.openstreetmap.org:93.168.179.231
 
 # Bytemark virtual machine, and the services which operate from it
 
@@ -140,8 +141,8 @@
 +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
++idris.internal.openstreetmap.org:10.0.0.253
 
 # Wiki is currently fronted by Grant's proxy (short timeout to allow changes)