# 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
# Delegate geo.openstreetmap.org to PowerDNS
# shenron.openstreetmap.org
-&geo.openstreetmap:89.16.179.150:a.ns.openstreetmap.org
+&geo.openstreetmap:89.16.179.150:a.ns.openstreetmap
# nadder-02.openstreetmap.org
-&geo.openstreetmap:192.163.219.40:b.ns.openstreetmap.org
+&geo.openstreetmap:192.163.219.40:b.ns.openstreetmap
# fume.openstreetmap.org
-&geo.openstreetmap:85.30.190.241:c.ns.openstreetmap.org
-# bunyip.openstreetmap.org
-#&geo.openstreetmap:203.26.72.12:d.ns.openstreetmap.org
+&geo.openstreetmap:85.30.190.241:c.ns.openstreetmap
# Main web servers and their aliases
+rails3.ic.openstreetmap:146.179.159.167
+thorn-03.oob.openstreetmap:146.179.159.183
-# Nominatim server
+# Nominatim servers
-+poldi.openstreetmap:128.40.168.106
-+nominatim.openstreetmap:128.40.168.106:3600
++poldi.openstreetmap:128.40.45.203
++nominatim.openstreetmap:128.40.45.203:3600
+poldi.ucl.openstreetmap:10.0.0.16
+poldi.oob.openstreetmap:10.0.1.16
++pummelzacken.openstreetmap:128.40.45.204
++pummelzacken.ucl.openstreetmap:10.0.0.20
++pummelzacken.oob.openstreetmap:10.0.1.20
+
# JXAPI server
-+norbert.openstreetmap:128.40.168.100
-+jxapi.openstreetmap:128.40.168.100
-+norbert.ilo.openstreetmap:10.0.0.55
++norbert.openstreetmap:128.40.45.202
++jxapi.openstreetmap:128.40.45.202:600
+norbert.ucl.openstreetmap:10.0.0.5
+norbert.oob.openstreetmap:10.0.1.5
# OWL server
-+zark.openstreetmap:128.40.168.107
-+owl.openstreetmap:128.40.168.107
++zark.openstreetmap:128.40.45.209
++owl.openstreetmap:128.40.45.209
+zark.ucl.openstreetmap:10.0.0.8
+zark.oob.openstreetmap:10.0.1.8
+# Taginfo server
+
++grindtooth.openstreetmap:128.40.45.199
++taginfo.openstreetmap:128.40.45.199: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
3orm.openstreetmap:200106300012050002e081fffec52a8c
#+orm.ic.openstreetmap:10.0.16.2
+orm.oob.openstreetmap:146.179.159.175
-+yevaud.openstreetmap:128.40.168.104
++yevaud.openstreetmap:128.40.45.208
+yevaud.ucl.openstreetmap:10.0.0.15
+yevaud.oob.openstreetmap:10.0.1.15
Ctile.openstreetmap:tile.geo.openstreetmap.org
# 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
+ramoth.oob.openstreetmap:146.179.159.181
+katla.ic.openstreetmap:146.179.159.173
++db-slave.ic.openstreetmap:146.179.159.173:600
+katla.oob.openstreetmap:146.179.159.174
# Development server with wildcard alias for user sites
-+errol.openstreetmap:128.40.168.103
-+dev.openstreetmap:128.40.168.103
-+*.dev.openstreetmap:128.40.168.103
-+ooc.openstreetmap:128.40.168.103
-+a.ooc.openstreetmap:128.40.168.103
-+b.ooc.openstreetmap:128.40.168.103
-+c.ooc.openstreetmap:128.40.168.103
-+npe.openstreetmap:128.40.168.103
++errol.openstreetmap:128.40.45.196
++dev.openstreetmap:128.40.45.196
++*.dev.openstreetmap:128.40.45.196
++ooc.openstreetmap:128.40.45.196
++a.ooc.openstreetmap:128.40.45.196
++b.ooc.openstreetmap:128.40.45.196
++c.ooc.openstreetmap:128.40.45.196
++npe.openstreetmap:128.40.45.196
+errol.ucl.openstreetmap:10.0.0.14
+errol.oob.openstreetmap:10.0.1.14
# Foundation server
-+ridley.openstreetmap:128.40.168.102
-+otrs.openstreetmap:128.40.168.102
-+thinkup.openstreetmap:128.40.168.102
-+blog.openstreetmap:128.40.168.102
-+foundation.openstreetmap:128.40.168.102
++ridley.openstreetmap:128.40.45.205
++otrs.openstreetmap:128.40.45.205
++thinkup.openstreetmap:128.40.45.205
++blog.openstreetmap:128.40.45.205
++foundation.openstreetmap:128.40.45.205
+ridley.ucl.openstreetmap:10.0.0.3
+ridley.oob.openstreetmap:10.0.1.3
# Piwik server
-+eustace.openstreetmap:128.40.168.101
-+piwik.openstreetmap:128.40.168.101
++eustace.openstreetmap:128.40.45.197
++piwik.openstreetmap:128.40.45.197
+eustace.ucl.openstreetmap:10.0.0.9
+eustace.oob.openstreetmap:10.0.1.9
# Imagery servers
-+faffy.openstreetmap:128.40.168.108
-+agri.openstreetmap:128.40.168.108:3600
-+a.agri.openstreetmap:128.40.168.108:3600
-+b.agri.openstreetmap:128.40.168.108:3600
-+c.agri.openstreetmap:128.40.168.108:3600
-+os.openstreetmap:128.40.168.108:3600
-+a.os.openstreetmap:128.40.168.108:3600
-+b.os.openstreetmap:128.40.168.108:3600
-+c.os.openstreetmap:128.40.168.108:3600
++faffy.openstreetmap:128.40.45.198
++agri.openstreetmap:128.40.45.198:3600
++a.agri.openstreetmap:128.40.45.198:3600
++b.agri.openstreetmap:128.40.45.198:3600
++c.agri.openstreetmap:128.40.45.198:3600
++os.openstreetmap:128.40.45.198:3600
++a.os.openstreetmap:128.40.45.198:3600
++b.os.openstreetmap:128.40.45.198:3600
++c.os.openstreetmap:128.40.45.198:3600
+faffy.ucl.openstreetmap:10.0.0.7
+faffy.oob.openstreetmap:10.0.1.7
-+draco.openstreetmap:128.40.168.95
++draco.openstreetmap:128.40.45.195
+draco.ucl.openstreetmap:10.0.0.11
+draco.oob.openstreetmap:10.0.1.11
# Munin server
-+urmel.openstreetmap:128.40.168.96
-+munin.openstreetmap:128.40.168.96:600
++urmel.openstreetmap:128.40.45.207
++munin.openstreetmap:128.40.45.207:600
+urmel.ucl.openstreetmap:10.0.0.6
+urmel.oob.openstreetmap:10.0.1.6
# Gosmore routing server
-+sarel.openstreetmap:128.40.168.97
++sarel.openstreetmap:128.40.45.206
+sarel.ucl.openstreetmap:10.0.0.12
+sarel.oob.openstreetmap:10.0.1.12
+# Forum server
+
++clifford.openstreetmap:128.40.45.194
++clifford.ucl.openstreetmap:10.0.0.17
++clifford.oob.openstreetmap:10.0.1.17
+
+# Loan machine for emacsen
+
++ascalon.openstreetmap:128.40.45.193
++ascalon.ucl.openstreetmap:10.0.0.18
++ascalon.oob.openstreetmap:10.0.1.18
+
# 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
# Wiki server
-+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
++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.45.201
++gps.tile.openstreetmap:128.40.45.201
++gps-a.tile.openstreetmap:128.40.45.201
++gps-b.tile.openstreetmap:128.40.45.201
++gps-c.tile.openstreetmap:128.40.45.201
++a.gps-tile.openstreetmap:128.40.45.201
++b.gps-tile.openstreetmap:128.40.45.201
++c.gps-tile.openstreetmap:128.40.45.201
++noquiklos.ucl.openstreetmap:10.0.0.13
++noquiklos.oob.openstreetmap:10.0.1.13
+
# Tile cache servers
+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
+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
+
+# OSUOSL machines
+
+stormfly-01.openstreetmap:140.211.167.104
+stormfly-01.oob.openstreetmap:10.0.0.99
+stormfly-02.openstreetmap:140.211.167.105
+stormfly-02.oob.openstreetmap:10.0.0.108