# Make the virtual machine the primary MX with Bytemark as backup
-@openstreetmap.org:89.16.177.88:a:10
+@openstreetmap.org:89.16.179.150:a:10
@openstreetmap.org::backup.mx.bytemark.co.uk:20
-@otrs.openstreetmap.org:89.16.177.88:a:10
-@messages.openstreetmap.org:89.16.177.88:a:10
+@otrs.openstreetmap.org:89.16.179.150:a:10
+@messages.openstreetmap.org:89.16.179.150:a:10
-# Publish an SPF record indicating that only idris sends mail
+# Publish an SPF record indicating that only shenron sends mail
-'openstreetmap.org:v=spf1 ip4\07289.16.177.88 ~all
+'openstreetmap.org:v=spf1 ip4\07289.16.179.150 ~all
# Main web servers and their aliases
# Gazetteer (nominatim) server
-+katie.openstreetmap.org:128.40.168.101
-+katie.internal.openstreetmap.org:10.0.0.6
-+nominatim.openstreetmap.org:128.40.168.101
++poldi.openstreetmap.org:128.40.168.106
++poldi.internal.openstreetmap.org:10.0.0.16
++poldi.ilo.openstreetmap.org:10.0.0.66
++nominatim.openstreetmap.org:128.40.168.106
# Gazetteer (namefinder) server
+xapi.openstreetmap.org:128.40.168.97
+fafnir.internal.openstreetmap.org:10.0.0.4
+# OWL server
+
++albi.openstreetmap.org:128.40.168.95
++owl.openstreetmap.org:128.40.168.95
++albi.internal.openstreetmap.org:10.0.0.2
++albi.ilo.openstreetmap.org:10.0.0.52
+
+# Spare server
+
++azure.openstreetmap.org:128.40.168.100
++azure.internal.openstreetmap.org:10.0.0.5
++azure.ilo.openstreetmap.org:10.0.0.55
+
# Mapnik tile server, with wildcard alias to allow parallel loading
+yevaud.openstreetmap.org:128.40.168.104
# Development server with wildcard alias for user sites
-+old-dev.openstreetmap.org:128.40.168.100
-+*.old-dev.openstreetmap.org:128.40.168.100
-+old-dev.internal.openstreetmap.org:10.0.0.5
-
+errol.openstreetmap.org:128.40.168.103
+dev.openstreetmap.org:128.40.168.103
+*.dev.openstreetmap.org:128.40.168.103
+planet.openstreetmap.org:128.40.168.99
-# Spare servers
-
-+dulcy.internal.openstreetmap.org:10.0.0.2
-
# APC power switch
+apc1.internal.openstreetmap.org:10.0.0.49
++apc2.internal.openstreetmap.org:10.0.0.50
++apc3.internal.openstreetmap.org:10.0.0.51
# Forum server
+forum.openstreetmap.org:93.186.179.231
-# Bytemark virtual machine, and the services which operate from it
-
-+vm.openstreetmap.org:80.68.94.95
-+stats.wiki.openstreetmap.org:80.68.94.95
-+vm.internal.openstreetmap.org:10.0.0.253
-
-# Bytemark atom machine, and the services which operate from it
-
-+idris.openstreetmap.org:89.16.177.88
-+mail.openstreetmap.org:89.16.177.88
-+lists.openstreetmap.org:89.16.177.88
-+svn.openstreetmap.org:89.16.177.88
-+git.openstreetmap.org:89.16.177.88
-+trac.openstreetmap.org:89.16.177.88
-+irc.openstreetmap.org:89.16.177.88
-+help.openstreetmap.org:89.16.177.88
-+idris.internal.openstreetmap.org:10.0.0.253
+# Bytemark machine, and the services which operate from it
+
++shenron.openstreetmap.org:89.16.179.150
++mail.openstreetmap.org:89.16.179.150
++lists.openstreetmap.org:89.16.179.150
++svn.openstreetmap.org:89.16.179.150
++git.openstreetmap.org:89.16.179.150
++trac.openstreetmap.org:89.16.179.150
++irc.openstreetmap.org:89.16.179.150
++help.openstreetmap.org:89.16.179.150
++shenron.internal.openstreetmap.org:10.0.0.251
+
+3shenron.openstreetmap.org:200141c800100996021d7dfffec3df70
+3mail.openstreetmap.org:200141c800100996021d7dfffec3df70
+3lists.openstreetmap.org:200141c800100996021d7dfffec3df70
+3svn.openstreetmap.org:200141c800100996021d7dfffec3df70
+3git.openstreetmap.org:200141c800100996021d7dfffec3df70
+3trac.openstreetmap.org:200141c800100996021d7dfffec3df70
+3irc.openstreetmap.org:200141c800100996021d7dfffec3df70
+3help.openstreetmap.org:200141c800100996021d7dfffec3df70
# Wiki server