# Main web servers and their aliases
-+spike-01.openstreetmap:193.63.75.99
-3spike-01.openstreetmap:2001063000120500021a4bfffea5fd2a
++spike-01.openstreetmap:193.63.75.99:600
+3spike-01.openstreetmap:2001063000120500021a4bfffea5fd2a:600
#+openstreetmap:193.63.75.99:600
#3openstreetmap:2001063000120500021a4bfffea5fd2a:600
#+www.openstreetmap:193.63.75.99:600
+spike-01.ic.openstreetmap:146.179.159.162:600
+spike-01.oob.openstreetmap:146.179.159.188:600
-+spike-02.openstreetmap:193.63.75.100
-3spike-02.openstreetmap:20010630001205000219bbfffe393d9e
++spike-02.openstreetmap:193.63.75.100:600
+3spike-02.openstreetmap:20010630001205000219bbfffe393d9e:600
#+openstreetmap:193.63.75.100:600
#3openstreetmap:20010630001205000219bbfffe393d9e:600
#+www.openstreetmap:193.63.75.100:600
+spike-02.ic.openstreetmap:146.179.159.163:600
+spike-02.oob.openstreetmap:146.179.159.180:600
-+spike-03.openstreetmap:193.63.75.103
-3spike-03.openstreetmap:20010630001205000219bbfffe398aba
++spike-03.openstreetmap:193.63.75.103:600
+3spike-03.openstreetmap:20010630001205000219bbfffe398aba:600
#+openstreetmap:193.63.75.103:600
#3openstreetmap:20010630001205000219bbfffe398aba:600
#+www.openstreetmap:193.63.75.103:600
# Nominatim servers
+pummelzacken.openstreetmap:193.60.236.18
-#+nominatim.openstreetmap:193.60.236.18:600
++nominatim.openstreetmap:193.60.236.18:600
+pummelzacken.ucl.openstreetmap:10.0.0.20
+pummelzacken.oob.openstreetmap:10.0.1.20
-+dulcy.openstreetmap:193.63.75.109
-3dulcy.openstreetmap:20010630001205000ec47afffe6696d2
-+nominatim.openstreetmap:193.63.75.109:600
-3nominatim.openstreetmap:20010630001205000ec47afffe6696d2:600
++dulcy.openstreetmap:193.63.75.109:600
+3dulcy.openstreetmap:20010630001205000ec47afffe6696d2:600
+#+nominatim.openstreetmap:193.63.75.109:600
+#3nominatim.openstreetmap:20010630001205000ec47afffe6696d2:600
+dulcy.ic.openstreetmap:146.179.159.179:600
#+dulcy.oob.openstreetmap:
# Mapnik tile server, with wildcard alias to allow parallel loading
-+orm.openstreetmap:193.63.75.98
-3orm.openstreetmap:200106300012050002e081fffec52a8c
++orm.openstreetmap:193.63.75.98:600
+3orm.openstreetmap:200106300012050002e081fffec52a8c:600
#+orm.ic.openstreetmap:10.0.16.2
+orm.oob.openstreetmap:146.179.159.175:600
+scorch.openstreetmap:176.31.235.79
3scorch.openstreetmap:200141d00002fc4f0000000000000001
++rhaegal.openstreetmap:161.53.248.77:600
+
Ctile.openstreetmap:tile.geo.openstreetmap.org
Ca.tile.openstreetmap:tile.geo.openstreetmap.org
Cb.tile.openstreetmap:tile.geo.openstreetmap.org
# Services machine
-+ironbelly.openstreetmap:193.63.75.107
-3ironbelly.openstreetmap:2001063000120500022590fffec4f6ef
++ironbelly.openstreetmap:193.63.75.107:600
+3ironbelly.openstreetmap:2001063000120500022590fffec4f6ef:600
#+backup.openstreetmap:193.63.75.107:600
#3backup.openstreetmap:2001063000120500022590fffec4f6ef:600
#+planet.openstreetmap:193.63.75.107:600
#3planet.openstreetmap:2001063000120500022590fffec4f6ef:600
-+stats.openstreetmap:193.63.75.107
-3stats.openstreetmap:2001063000120500022590fffec4f6ef
-+logstash.openstreetmap:193.63.75.107
-3logstash.openstreetmap:2001063000120500022590fffec4f6ef
-+ironbelly.ic.openstreetmap:146.179.159.177
-+ironbelly.oob.openstreetmap:146.179.159.176
++stats.openstreetmap:193.63.75.107:600
+3stats.openstreetmap:2001063000120500022590fffec4f6ef:600
++logstash.openstreetmap:193.63.75.107:600
+3logstash.openstreetmap:2001063000120500022590fffec4f6ef:600
++ironbelly.ic.openstreetmap:146.179.159.177:600
++ironbelly.oob.openstreetmap:146.179.159.176:600
+grisu.openstreetmap:89.16.162.20
3grisu.openstreetmap:200141c9000200d60000000000000020
+karm.ic.openstreetmap:146.179.159.168:600
+karm.oob.openstreetmap:146.179.159.173:600
-+eddie.ucl.openstreetmap:10.0.0.10:600
-+eddie.oob.openstreetmap:10.0.1.10:600
++eddie.ucl.openstreetmap:10.0.0.10
++eddie.oob.openstreetmap:10.0.1.10
+katla.bm.openstreetmap:10.0.32.40
+katla.oob.openstreetmap:10.0.33.40
# Managed network switches
-+switch1.openstreetmap:193.63.75.102
++switch1.openstreetmap:193.63.75.102:600
+switch2.ic.openstreetmap:146.179.159.169:600
# Bytemark machine, and the services which operate from it
# Wiki servers
-+ouroboros.openstreetmap:193.63.75.106
-3ouroboros.openstreetmap:200106300012050002237dfffeea813a
++ouroboros.openstreetmap:193.63.75.106:600
+3ouroboros.openstreetmap:200106300012050002237dfffeea813a:600
#+wiki.openstreetmap:193.63.75.106:600
#3wiki.openstreetmap:200106300012050002237dfffeea813a:600
+ouroboros.ic.openstreetmap:146.179.159.172:600