# Gazetteer server
+gazetteer.openstreetmap.org:128.40.168.96
-+npe.openstreetmap.org:128.40.168.96
+gazetteer.internal.openstreetmap.org:10.0.0.1
# XAPI server
# 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
++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
# Development server with wildcard alias for user sites
-+dev.openstreetmap.org:128.40.168.100
-+*.dev.openstreetmap.org:128.40.168.100
++old-dev.openstreetmap.org:128.40.168.100
++*.old-dev.openstreetmap.org:128.40.168.100
+dev.internal.openstreetmap.org:10.0.0.5
-# Planet dumps are currently served from dev
++errol.openstreetmap.org:128.40.168.103
++dev.openstreetmap.org:128.40.168.103
++*.dev.openstreetmap.org:128.40.168.103
++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.openstreetmap.org:128.40.168.100
+# Foundation server
+
++ridley.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.internal.openstreetmap.org:10.0.0.3
++katie.openstreetmap.org:128.40.168.101
+katie.internal.openstreetmap.org:10.0.0.6
# APC power switch
+
+apc1.internal.openstreetmap.org:10.0.0.49
# Forum server
+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)