# Make the virtual machine the primary MX with Bytemark as backup
@openstreetmap:89.16.179.150:a:10
-@openstreetmap::backup.mx.bytemark.co.uk:20
@noreply.openstreetmap::a.mx.openstreetmap:10
@otrs.openstreetmap::a.mx.openstreetmap:10
@messages.openstreetmap::a.mx.openstreetmap:10
# 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
# Services machine
-+horntail.openstreetmap:193.63.75.101
-3horntail.openstreetmap:20010630001205000202b3fffeeceeac
-+horntail.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
+ironbelly.oob.openstreetmap:146.179.159.176
+backup.ic.openstreetmap:146.179.159.177
-# Database server
+# Database servers
+smaug.ic.openstreetmap:146.179.159.168
+smaug.oob.openstreetmap:146.179.159.182
+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:93.186.179.231:600
# Bytemark machine, and the services which operate from it
# Wiki server
-+konqi.openstreetmap:193.63.75.104
-3konqi.openstreetmap:2001063000120500021560fffeaa9956
-+konqi.ilo.openstreetmap:146.179.159.179
-+wiki.openstreetmap:193.63.75.106: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
++wiki.openstreetmap:193.63.75.106:600
+ouroboros.ic.openstreetmap:146.179.159.172
+ouroboros.oob.openstreetmap:146.179.159.178
+# GPS tile server
+
++noquiklos.openstreetmap:128.40.168.99
++gps.tile.openstreetmap:128.40.168.99
++gps-a.tile.openstreetmap:128.40.168.99
++gps-b.tile.openstreetmap:128.40.168.99
++gps-c.tile.openstreetmap:128.40.168.99
++a.gps-tile.openstreetmap:128.40.168.99
++b.gps-tile.openstreetmap:128.40.168.99
++c.gps-tile.openstreetmap:128.40.168.99
++noquiklos.ucl.openstreetmap:10.0.0.13
++noquiklos.oob.openstreetmap:10.0.1.13
+
# Tile cache servers
+fume.openstreetmap:85.30.190.241
+ridgeback.openstreetmap:31.169.50.10
+ridgeback.oob.openstreetmap:31.169.50.14
+jakelong.openstreetmap:64.62.205.202
+3jakelong.openstreetmap:2001047000010041a80000fffe3ecdca
+nepomuk.openstreetmap:77.95.70.166
-3nepomuk.openstreetmap:200107f80047002100000000000000a6
-+grisu.openstreetmap:142.4.213.166
-3grisu.openstreetmap:26075300006012a60000000000000001
+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:50.56.49.247
-+humanitarian.openstreetmap:50.56.49.247
-+hot-staging.openstreetmap:50.56.49.247
-+hot-dev.openstreetmap:50.56.49.247
++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