# Main web servers and their aliases
-+puff.openstreetmap:193.63.75.99
-+openstreetmap:193.63.75.99:600
-+www.openstreetmap:193.63.75.99:600
-+api.openstreetmap:193.63.75.99:600
-+maps.openstreetmap:193.63.75.99:600
-+mapz.openstreetmap:193.63.75.99:600
-+puff.ic.openstreetmap:146.179.159.162
-+puff.oob.openstreetmap:146.179.159.188
-
-+fuchur.openstreetmap:193.63.75.100
++soup.openstreetmap:193.63.75.99
+#+openstreetmap:193.63.75.99:600
+#+www.openstreetmap:193.63.75.99:600
+#+api.openstreetmap:193.63.75.99:600
+#+maps.openstreetmap:193.63.75.99:600
+#+mapz.openstreetmap:193.63.75.99:600
++soup.ic.openstreetmap:146.179.159.162
++soup.oob.openstreetmap:146.179.159.188
+
++fiddlestick.openstreetmap:193.63.75.100
+openstreetmap:193.63.75.100:600
+www.openstreetmap:193.63.75.100:600
+api.openstreetmap:193.63.75.100:600
+maps.openstreetmap:193.63.75.100:600
+mapz.openstreetmap:193.63.75.100:600
-+fuchur.ic.openstreetmap:146.179.159.163
-+fuchur.oob.openstreetmap:146.179.159.187
++fiddlestick.ic.openstreetmap:146.179.159.163
++fiddlestick.oob.openstreetmap:146.179.159.187
# Rails application servers
# Mapnik tile server, with wildcard alias to allow parallel loading
+yevaud.openstreetmap:128.40.168.104
-+tile.openstreetmap:193.63.75.98:600
++tile.openstreetmap:193.63.75.26:600
+a.tile.openstreetmap:193.63.75.26:600
-+b.tile.openstreetmap:128.40.168.95:600
++b.tile.openstreetmap:193.63.75.26:600
+c.tile.openstreetmap:128.40.168.95:600
++parent.tile.openstreetmap:128.40.168.104:300
+yevaud.ucl.openstreetmap:10.0.0.15
+yevaud.oob.openstreetmap:10.0.1.15
+foundation.openstreetmap:128.40.168.102
+ridley.ucl.openstreetmap:10.0.0.3
+# Spare machines
+
++urmel.ucl.openstreetmap:10.0.0.6
++urmel.oob.openstreetmap:10.0.1.6
++faffy.ucl.openstreetmap:10.0.0.7
++faffy.oob.openstreetmap:10.0.1.7
++eustace.ucl.openstreetmap:10.0.0.9
++eustace.oob.openstreetmap:10.0.1.9
+
# APC power switches
+apc1.ucl.openstreetmap:10.0.0.49