# Main web servers and their aliases
+spike-01.openstreetmap:193.63.75.99
+3spike-01.openstreetmap:2001063000120500021a4bfffea5fd2a
+openstreetmap:193.63.75.99:600
+3openstreetmap:2001063000120500021a4bfffea5fd2a:600
+www.openstreetmap:193.63.75.99:600
+3www.openstreetmap:2001063000120500021a4bfffea5fd2a:600
+api.openstreetmap:193.63.75.99:600
+3api.openstreetmap:2001063000120500021a4bfffea5fd2a:600
+maps.openstreetmap:193.63.75.99:600
+3maps.openstreetmap:2001063000120500021a4bfffea5fd2a:600
+mapz.openstreetmap:193.63.75.99:600
+3mapz.openstreetmap:2001063000120500021a4bfffea5fd2a:600
+spike-01.ic.openstreetmap:146.179.159.162
+www.ic.openstreetmap:146.179.159.162:3600
+spike-01.oob.openstreetmap:146.179.159.188
+spike-02.openstreetmap:193.63.75.100
+3spike-02.openstreetmap:20010630001205000219bbfffe393d9e
+openstreetmap:193.63.75.100:600
+3openstreetmap:20010630001205000219bbfffe393d9e:600
+www.openstreetmap:193.63.75.100:600
+3www.openstreetmap:20010630001205000219bbfffe393d9e:600
+api.openstreetmap:193.63.75.100:600
+3api.openstreetmap:20010630001205000219bbfffe393d9e:600
+maps.openstreetmap:193.63.75.100:600
+3maps.openstreetmap:20010630001205000219bbfffe393d9e:600
+mapz.openstreetmap:193.63.75.100:600
+3mapz.openstreetmap:20010630001205000219bbfffe393d9e:600
+spike-02.ic.openstreetmap:146.179.159.163
+www.ic.openstreetmap:146.179.159.163:3600
+spike-02.oob.openstreetmap:146.179.159.180
+spike-03.openstreetmap:193.63.75.103
+3spike-03.openstreetmap:20010630001205000219bbfffe398aba
+openstreetmap:193.63.75.103:600
+3openstreetmap:20010630001205000219bbfffe398aba:600
+www.openstreetmap:193.63.75.103:600
+3www.openstreetmap:20010630001205000219bbfffe398aba:600
+api.openstreetmap:193.63.75.103:600
+3api.openstreetmap:20010630001205000219bbfffe398aba:600
+maps.openstreetmap:193.63.75.103:600
+3maps.openstreetmap:20010630001205000219bbfffe398aba:600
+mapz.openstreetmap:193.63.75.103:600
+3mapz.openstreetmap:20010630001205000219bbfffe398aba:600
+spike-03.ic.openstreetmap:146.179.159.171
+www.ic.openstreetmap:146.179.159.171:3600
+spike-03.oob.openstreetmap:146.179.159.187
# Nominatim server
+poldi.openstreetmap:128.40.168.106
-+nominatim.openstreetmap:128.40.168.106:600
++nominatim.openstreetmap:128.40.168.106:3600
+poldi.ucl.openstreetmap:10.0.0.16
+poldi.oob.openstreetmap:10.0.1.16
-# XAPI server
-
-+fafnir.openstreetmap:128.40.168.97
-+xapi.openstreetmap:128.40.168.97
-+fafnir.ucl.openstreetmap:10.0.0.4
-
-# Tile cache server
-
-+albi.openstreetmap:128.40.168.95
-+albi.ilo.openstreetmap:10.0.0.52
-+albi.ucl.openstreetmap:10.0.0.2
-+albi.oob.openstreetmap:10.0.1.2
-
# JXAPI server
+norbert.openstreetmap:128.40.168.100
# OWL server
+zark.openstreetmap:128.40.168.107
-+owl.openstreetmap:128.40.168107
++owl.openstreetmap:128.40.168.107
+zark.ucl.openstreetmap:10.0.0.8
+zark.oob.openstreetmap:10.0.1.8
+yevaud.ucl.openstreetmap:10.0.0.15
+yevaud.oob.openstreetmap:10.0.1.15
-# Map geographic zones to tile servers
-
-+london.tile.openstreetmap:193.63.75.98:3600
-+sjobo.tile.openstreetmap:85.30.190.241:3600
-# remove IPv6 until we have IPv6 capable squid
-# 3sjobo.tile.openstreetmap:2a02008000003ff8022264fffe2a2714:3600
-+moscow.tile.openstreetmap:130.193.62.73:3600
-+brisbane.tile.openstreetmap:203.26.72.12:3600
-
# Services machine
+horntail.openstreetmap:193.63.75.101
-+planet.openstreetmap:193.63.75.101
-+apt.openstreetmap:193.63.75.101
-+stats.openstreetmap:193.63.75.101
-+chef.openstreetmap:193.63.75.101
-+backup.openstreetmap:193.63.75.101
+3horntail.openstreetmap:20010630001205000202b3fffeeceeac
+horntail.ic.openstreetmap:146.179.159.164
+backup.ic.openstreetmap:146.179.159.164
+horntail.oob.openstreetmap:146.179.159.186
++ironbelly.openstreetmap:193.63.75.107
+3ironbelly.openstreetmap:2001063000120500022590fffec4f6ef
++chef.openstreetmap:193.63.75.107
+3chef.openstreetmap:2001063000120500022590fffec4f6ef
++backup.openstreetmap:193.63.75.107
+3backup.openstreetmap:2001063000120500022590fffec4f6ef
++stats.openstreetmap:193.63.75.107
+3stats.openstreetmap:2001063000120500022590fffec4f6ef
++planet.openstreetmap:193.63.75.107
+3planet.openstreetmap:2001063000120500022590fffec4f6ef
++ironbelly.ic.openstreetmap:146.179.159.177
++ironbelly.oob.openstreetmap:146.179.159.176
+
# Database server
+smaug.ic.openstreetmap:146.179.159.168
+db.ic.openstreetmap:146.179.159.170:600
+ramoth.oob.openstreetmap:146.179.159.181
++katla.ic.openstreetmap:146.179.159.173
++katla.oob.openstreetmap:146.179.159.174
+
# Development server with wildcard alias for user sites
+errol.openstreetmap:128.40.168.103
+eustace.ucl.openstreetmap:10.0.0.9
+eustace.oob.openstreetmap:10.0.1.9
-# Imagery server
+# Imagery servers
+faffy.openstreetmap:128.40.168.108
+agri.openstreetmap:128.40.168.108:3600
+faffy.ucl.openstreetmap:10.0.0.7
+faffy.oob.openstreetmap:10.0.1.7
++draco.openstreetmap:128.40.168.95
++draco.ucl.openstreetmap:10.0.0.11
++draco.oob.openstreetmap:10.0.1.11
+
# Munin server
+urmel.openstreetmap:128.40.168.96
+urmel.ucl.openstreetmap:10.0.0.6
+urmel.oob.openstreetmap:10.0.1.6
+# Gosmore routing server
+
++sarel.openstreetmap:128.40.168.97
++sarel.ucl.openstreetmap:10.0.0.12
++sarel.oob.openstreetmap:10.0.1.12
+
# Spare machines
+puff.ucl.openstreetmap:10.0.0.10
+puff.oob.openstreetmap:10.0.1.10
++idris.openstreetmap:128.40.168.98
++idris.ucl.openstreetmap:10.0.0.4
++idris.oob.openstreetmap:10.0.1.4
# APC power switches
# Wiki server
-+konqi.openstreetmap:193.63.75.26:600
-+konqi.ilo.openstreetmap:193.63.75.27:600
-+wiki.openstreetmap:193.63.75.26:600
-+dump.wiki.openstreetmap:193.63.75.26:600
++konqi.openstreetmap:193.63.75.104
+3konqi.openstreetmap:2001063000120500021560fffeaa9956
++konqi.ilo.openstreetmap:146.179.159.179
++wiki.openstreetmap:193.63.75.104:600
++dump.wiki.openstreetmap:193.63.75.104:600
#+konqi.ic.openstreetmap:10.0.16.1
#+konqi.oob.openstreetmap:10.0.17.1
++ouroboros.openstreetmap:193.63.75.106
+3ouroboros.openstreetmap:200106300012050002237dfffeea813a
++ouroboros.ic.openstreetmap:146.179.159.172
++ouroboros.oob.openstreetmap:146.179.159.178
+
# Tile cache servers
+orm.openstreetmap:193.63.75.98
+3orm.openstreetmap:200106300012050002e081fffec52a8c
#+orm.ic.openstreetmap:10.0.16.2
-#+orm.oob.openstreetmap:10.0.17.2
++orm.oob.openstreetmap:146.179.159.175
+fume.openstreetmap:85.30.190.241
3fume.openstreetmap:2a02008000003ff8022264fffe2a2714
+fume.oob.openstreetmap:85.30.129.98
+gorynych.openstreetmap:130.193.62.73
+bunyip.openstreetmap:203.26.72.12
+3bunyip.openstreetmap:2402640000010006021708fffe5640c3
++lurien.openstreetmap:193.55.222.229
++trogdor.openstreetmap:134.90.146.26
++trogdor.oob.openstreetmap:134.90.146.30
++ridgeback.openstreetmap:31.169.50.10
++ridgeback.oob.openstreetmap:31.169.50.14
++jakelong.openstreetmap:64.62.205.202
++nepomuk.openstreetmap:77.95.70.166
+3nepomuk.openstreetmap:200107f80047002100000000000000a6
++grisu.openstreetmap:142.4.213.166
+3grisu.openstreetmap:26075300006012a60000000000000001
++tabaluga.openstreetmap:5.9.150.236
+3tabaluga.openstreetmap:2a0104f8019033eb0000000000000002
++nadder-01.openstreetmap:192.163.219.36
++nadder-02.openstreetmap:192.163.219.40
# Blog aggregator (on Shaun McDonald's VM)
+blogs.openstreetmap:89.16.175.12
-# Cruise (on Shaun McDonald's VM)
+# Continuous integration server (on Shaun McDonald's machine)
-+cruise.openstreetmap:89.16.175.12
++ci.openstreetmap:5.9.72.139
++cruise.openstreetmap:5.9.72.139
# Donation site
# Jochen Topf's taginfo service, running on openstreetmap.de hardware
-+taginfo.openstreetmap:85.214.118.227
-3taginfo.openstreetmap:2a0102384000000003cac7808a7d7be2
++taginfo.openstreetmap:85.214.112.59
+3taginfo.openstreetmap:2a01023840000000002168799ac19e7e