# Make the virtual machine the primary MX with Bytemark as backup
-@openstreetmap.org:80.68.94.95:a:10
+@openstreetmap.org:89.16.177.88: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
+
+# Publish an SPF record indicating that only idris sends mail
+
+'openstreetmap.org:v=spf1 ip4\07289.16.177.88 ~all
# Main web server and it's aliases
-+openstreetmap.org:128.40.58.202
-+www.openstreetmap.org:128.40.58.202
-+api.openstreetmap.org:128.40.58.202
-+www.internal.openstreetmap.org:10.0.0.2
++puff.openstreetmap.org:128.40.168.98
++openstreetmap.org:128.40.168.98
++www.openstreetmap.org:128.40.168.98
++api.openstreetmap.org:128.40.168.98
++maps.openstreetmap.org:128.40.168.98
++mapz.openstreetmap.org:128.40.168.98
++puff.internal.openstreetmap.org:10.0.0.8
++puff.ilo.openstreetmap.org:10.0.0.58
# Rails application servers
-+rails1.internal.openstreetmap.org:10.0.0.3
-+rails2.internal.openstreetmap.org:10.0.0.4
++draco.internal.openstreetmap.org:10.0.0.10
++rails1.internal.openstreetmap.org:10.0.0.10
++draco.ilo.openstreetmap.org:10.0.0.60
++sarel.internal.openstreetmap.org:10.0.0.11
++rails2.internal.openstreetmap.org:10.0.0.11
++sarel.ilo.openstreetmap.org:10.0.0.61
++norbert.internal.openstreetmap.org:10.0.0.12
++rails3.internal.openstreetmap.org:10.0.0.12
++norbert.ilo.openstreetmap.org:10.0.0.62
+
+# 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
-# Gazetteer server
+# Gazetteer (namefinder) server
-+gazetteer.openstreetmap.org:128.40.58.201:3600
-+gazetteer.internal.openstreetmap.org:10.0.0.1:3600
++gazetteer.openstreetmap.org:128.40.168.96
++gazetteer.internal.openstreetmap.org:10.0.0.1
+
+# XAPI server
+
++fafnir.openstreetmap.org:128.40.168.97
++xapi.openstreetmap.org:128.40.168.97
++fafnir.internal.openstreetmap.org:10.0.0.4
# Mapnik tile server, with wildcard alias to allow parallel loading
-+tile.openstreetmap.org:128.40.58.204:3600
-+*.tile.openstreetmap.org:128.40.58.204:3600
-+tile.internal.openstreetmap.org:10.0.0.7
++yevaud.openstreetmap.org:128.40.168.104
++tile.openstreetmap.org:128.40.168.104
++a.tile.openstreetmap.org:128.40.168.104
++b.tile.openstreetmap.org:128.40.168.104
++c.tile.openstreetmap.org:128.40.168.104
++yevaud.internal.openstreetmap.org:10.0.0.15
++yevaud.ilo.openstreetmap.org:10.0.0.65
-# Osmarender tile server, with wildcard alias to allow parallel loading
+# Services machine
-+tah.openstreetmap.org:137.110.119.130
-+*.tah.openstreetmap.org:137.110.119.130
++horntail.openstreetmap.org:128.40.168.99
++munin.openstreetmap.org:128.40.168.99
++backup.openstreetmap.org:10.0.0.7
++horntail.internal.openstreetmap.org:10.0.0.7
++horntail.ilo.openstreetmap.org:10.1.0.7
-# Database server
+# Osmarender tile server, with wildcard alias to allow parallel loading
-+db.internal.openstreetmap.org:10.0.0.6
++tah.openstreetmap.org:129.132.168.206
++a.tah.openstreetmap.org:129.132.168.206
++b.tah.openstreetmap.org:129.132.168.206
++c.tah.openstreetmap.org:129.132.168.206
++d.tah.openstreetmap.org:129.132.168.206
++e.tah.openstreetmap.org:129.132.168.206
++f.tah.openstreetmap.org:129.132.168.206
++server.tah.openstreetmap.org:129.132.168.206
-# Backups are currently on rails1
+# Database server
-+backup.openstreetmap.org:10.0.0.3
++smaug.internal.openstreetmap.org:10.0.0.13
++db.internal.openstreetmap.org:10.0.0.13:60
++smaug.ilo.internal.openstreetmap.org:10.0.0.63
# Development server with wildcard alias for user sites
-+dev.openstreetmap.org:128.40.58.205
-+*.dev.openstreetmap.org:128.40.58.205
++old-dev.openstreetmap.org:128.40.168.100
++*.old-dev.openstreetmap.org:128.40.168.100
+dev.internal.openstreetmap.org:10.0.0.5
-# Planet dumps are currently served from dev
++errol.openstreetmap.org:128.40.168.103
++dev.openstreetmap.org:128.40.168.103
++*.dev.openstreetmap.org:128.40.168.103
++new-dev.openstreetmap.org:128.40.168.103
++*.new-dev.openstreetmap.org:128.40.168.103
++ooc.openstreetmap.org:128.40.168.103
++a.ooc.openstreetmap.org:128.40.168.103
++b.ooc.openstreetmap.org:128.40.168.103
++c.ooc.openstreetmap.org:128.40.168.103
++npe.openstreetmap.org:128.40.168.103
++os.openstreetmap.org:128.40.168.103
++a.os.openstreetmap.org:128.40.168.103
++b.os.openstreetmap.org:128.40.168.103
++c.os.openstreetmap.org:128.40.168.103
++errol.ilo.openstreetmap.org:10.0.0.64
+
+# Foundation server
+
++ridley.openstreetmap.org:128.40.168.102
++otrs.openstreetmap.org:128.40.168.102
++blog.openstreetmap.org:128.40.168.102
++foundation.openstreetmap.org:128.40.168.102
++ridley.internal.openstreetmap.org:10.0.0.3
+
+# Planet dumps are currently served from horntail
-+planet.openstreetmap.org:128.40.58.205
++planet.openstreetmap.org:128.40.168.99
-# Munin currently operates from tile
+# Spare servers
-+munin.openstreetmap.org:128.40.58.201
++fuchur.openstreetmap.org:128.40.168.105
++fuchur.internal.openstreetmap.org:10.0.0.9
++fuchur.ilo.openstreetmap.org:10.0.0.59
++dulcy.internal.openstreetmap.org:10.0.0.2
+
+# APC power switch
+
++apc1.internal.openstreetmap.org:10.0.0.49
# Forum server
-+forum.openstreetmap.org:87.239.8.25
++forum.openstreetmap.org:93.186.179.231
# Bytemark virtual machine, and the services which operate from it
+vm.openstreetmap.org:80.68.94.95
-+mail.openstreetmap.org:80.68.94.95
-+lists.openstreetmap.org:80.68.94.95
-+svn.openstreetmap.org:80.68.94.95
-+trac.openstreetmap.org:80.68.94.95
-#+wiki.openstreetmap.org:80.68.94.95
+stats.wiki.openstreetmap.org:80.68.94.95
-+foundation.openstreetmap.org:80.68.94.95
-+irc.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
+#+wiki.openstreetmap.org:89.16.177.88
++irc.openstreetmap.org:89.16.177.88
++idris.internal.openstreetmap.org:10.0.0.253
+
+# Wiki server
+
++konqi.openstreetmap.org:193.63.75.26
++konqi.ilo.openstreetmap.org:193.63.75.27
++konqi.internal.openstreetmap.org:10.0.0.252
++dump.wiki.openstreetmap.org:193.63.75.26
+
# Wiki is currently fronted by Grant's proxy (short timeout to allow changes)
+wiki.openstreetmap.org:89.145.68.232:3600
+# Blog aggregator (on Shaun McDonald's VM)
+
++blogs.openstreetmap.org:89.16.175.12
+
+# Cruise (on Shaun McDonald's VM)
+
++cruise.openstreetmap.org:89.16.175.12
+
+# Donation site
+
++donate.openstreetmap.org:89.145.67.86
+
# Our shop
Cshop.openstreetmap.org:virtual.fotopic.net
-
-# Private LAN addresses for the UCL machines
projects / dns.git / blobdiff