@openstreetmap:89.16.179.150:a:10
@openstreetmap::backup.mx.bytemark.co.uk:20
-@otrs.openstreetmap:89.16.179.150:a:10
-@messages.openstreetmap:89.16.179.150:a:10
+@otrs.openstreetmap::a.mx.openstreetmap:10
+@messages.openstreetmap::a.mx.openstreetmap:10
+
+3a.mx.openstreetmap:200141c800100996021d7dfffec3df70
# Publish an SPF record indicating that only shenron sends mail
-'openstreetmap:v=spf1 ip4\07289.16.179.150 ~all
+'openstreetmap:v=spf1 ip4\07289.16.179.150 ip6\0722001\07241c8\07210\072996\07221d\0727dff\072fec3\072df70 ~all
# Main web servers and their aliases
# Gazetteer (nominatim) server
-+katie.openstreetmap:128.40.168.101
-+katie.internal.openstreetmap:10.0.0.6
-+nominatim.openstreetmap:128.40.168.101
++poldi.openstreetmap:128.40.168.106
++poldi.internal.openstreetmap:10.0.0.16
++poldi.ilo.openstreetmap:10.0.0.66
++nominatim.openstreetmap:128.40.168.106
# Gazetteer (namefinder) server
# 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.openstreetmap:128.40.168.95
++owl.openstreetmap:128.40.168.95
++albi.internal.openstreetmap:10.0.0.2
++albi.ilo.openstreetmap:10.0.0.52
+
+# Spare server
+
++azure.openstreetmap:128.40.168.100
++azure.internal.openstreetmap:10.0.0.5
++azure.ilo.openstreetmap:10.0.0.55
# Mapnik tile server, with wildcard alias to allow parallel loading
+planet.openstreetmap:128.40.168.99
-# Spare servers
-
-+dulcy.internal.openstreetmap:10.0.0.2
-
# APC power switch
+apc1.internal.openstreetmap:10.0.0.49
+help.openstreetmap:89.16.179.150
+shenron.internal.openstreetmap:10.0.0.251
+3shenron.openstreetmap:200141c800100996021d7dfffec3df70
+3mail.openstreetmap:200141c800100996021d7dfffec3df70
+3lists.openstreetmap:200141c800100996021d7dfffec3df70
+3svn.openstreetmap:200141c800100996021d7dfffec3df70
+3git.openstreetmap:200141c800100996021d7dfffec3df70
+3trac.openstreetmap:200141c800100996021d7dfffec3df70
+3irc.openstreetmap:200141c800100996021d7dfffec3df70
+3help.openstreetmap:200141c800100996021d7dfffec3df70
+
# Wiki server
+konqi.openstreetmap:193.63.75.26
+wiki.openstreetmap:193.63.75.26
+dump.wiki.openstreetmap:193.63.75.26
+# Tile cache server
+
++orm.openstreetmap:193.63.75.98
+
# Blog aggregator (on Shaun McDonald's VM)
+blogs.openstreetmap:89.16.175.12