# JXAPI server
-+norbert.openstreetmap:128.40.168.100
-+jxapi.openstreetmap:128.40.168.100
-+norbert.ilo.openstreetmap:10.0.0.55
++jxapi.openstreetmap:128.40.168.108:600
+norbert.ucl.openstreetmap:10.0.0.5
+norbert.oob.openstreetmap:10.0.1.5
+zark.ucl.openstreetmap:10.0.0.8
+zark.oob.openstreetmap:10.0.1.8
+# Taginfo server
+
++grindtooth.openstreetmap:128.40.168.100
++taginfo.openstreetmap:128.40.168.100:600
++grindtooth.ucl.openstreetmap:10.0.0.19
++grindtooth.oob.openstreetmap:10.0.1.19
+
# Mapnik tile server, with wildcard alias to allow parallel loading
+orm.openstreetmap:193.63.75.98
+sarel.ucl.openstreetmap:10.0.0.12
+sarel.oob.openstreetmap:10.0.1.12
+# Forum server
+
++clifford.openstreetmap:128.40.168.98
++clifford.ucl.openstreetmap:10.0.0.17
++clifford.oob.openstreetmap:10.0.1.17
+
+# Loan machine for emacsen
+
++ascalon.openstreetmap:128.40.168.105
++ascalon.ucl.openstreetmap:10.0.0.18
++ascalon.oob.openstreetmap:10.0.1.18
++roundup.openstreetmap:128.40.168.105:600
+
# 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
# Forum server
-+forum.openstreetmap:93.186.179.231
++forum.openstreetmap:46.19.218.68:600
# Bytemark machine, and the services which operate from it
3jakelong.openstreetmap:2001047000010041a80000fffe3ecdca
+nepomuk.openstreetmap:77.95.70.166
3nepomuk.openstreetmap:2a0391800001002100000000000000a6
-
++simurgh.openstreetmap:94.20.20.55
+tabaluga.openstreetmap:5.9.150.236
3tabaluga.openstreetmap:2a0104f8019033eb0000000000000002
+nadder-01.openstreetmap:192.163.219.36
+nadder-02.openstreetmap:192.163.219.40
++longma.openstreetmap:140.110.240.7
+3longma.openstreetmap:20010e10200002400000000000000007
# Blog aggregator (on Shaun McDonald's VM)
# Donation site
-+donate.openstreetmap:89.145.67.86:600
++donate.openstreetmap:46.43.50.94:600
# DMCA Notice site
-+dmca.openstreetmap:89.145.67.86:600
++dmca.openstreetmap:46.43.50.94:600
# HOT site
-+hot.openstreetmap:144.76.31.210:3600
-+humanitarian.openstreetmap:144.76.31.210:3600
-+hot-staging.openstreetmap:144.76.31.210:3600
-+hot-dev.openstreetmap:144.76.31.210:3600
++hot.openstreetmap:144.76.31.210
++humanitarian.openstreetmap:144.76.31.210
++hot-staging.openstreetmap:144.76.31.210
++hot-dev.openstreetmap:144.76.31.210
# Jochen Topf's taginfo service, running on openstreetmap.de hardware
-+taginfo.openstreetmap:85.214.112.59
-3taginfo.openstreetmap:2a01023840000000002168799ac19e7e
+#+taginfo.openstreetmap:85.214.112.59:600
+#3taginfo.openstreetmap:2a01023840000000002168799ac19e7e:600