X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/7b9553bd3dea7c56b8407594b93b267571cdd2d1..a5eff02cc2c4bf21300e79f9cc7cffdfce9d18d3:/openstreetmap.org

diff --git a/openstreetmap.org b/openstreetmap.org
index 2f80bdc..a801cc3 100644
--- a/openstreetmap.org
+++ b/openstreetmap.org
@@ -10,44 +10,78 @@
 
 # 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
 
+# 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.58.203
++openstreetmap.org:128.40.58.203
++www.openstreetmap.org:128.40.58.203
++api.openstreetmap.org:128.40.58.203
++maps.openstreetmap.org:128.40.58.203
++mapz.openstreetmap.org:128.40.58.203
++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 server
 
-+gazetteer.openstreetmap.org:128.40.58.201:3600
-+gazetteer.internal.openstreetmap.org:10.0.0.1:3600
++gazetteer.openstreetmap.org:128.40.58.201
++gazetteer.internal.openstreetmap.org:10.0.0.1
+
+# XAPI server
+
++fafnir.openstreetmap.org:128.40.58.202
++xapi.openstreetmap.org:128.40.58.202
++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.openstreetmap.org:128.40.58.204
++a.tile.openstreetmap.org:128.40.58.204
++b.tile.openstreetmap.org:128.40.58.204
++c.tile.openstreetmap.org:128.40.58.204
 +tile.internal.openstreetmap.org:10.0.0.7
 
 # Osmarender tile server, with wildcard alias to allow parallel loading
 
-+tah.openstreetmap.org:137.110.119.130
-+*.tah.openstreetmap.org:137.110.119.130
++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
 
 # Database server
 
 +db.internal.openstreetmap.org:10.0.0.6
 
-# Backups are currently on rails1
+# New database server
 
-+backup.openstreetmap.org:10.0.0.3
++smaug.internal.openstreetmap.org:10.0.0.13
++smaug.ilo.internal.openstreetmap.org:10.0.0.63
+
+# Backups are currently on tile
+
++backup.openstreetmap.org:10.0.0.7
 
 # Development server with wildcard alias for user sites
 
@@ -59,10 +93,20 @@
 
 +planet.openstreetmap.org:128.40.58.205
 
-# Munin currently operates from tile
+# Munin currently operates from gazetteer
 
 +munin.openstreetmap.org:128.40.58.201
 
+# Spare servers
+
++fuchur.internal.openstreetmap.org:10.0.0.9
++fuchur.ilo.openstreetmap.org:10.0.0.59
++dulcy.internal.openstreetmap.org:10.0.0.2
++ridley.internal.openstreetmap.org:10.0.0.3
+
+# APC power switch
+apc1.internal.openstreetmap.org:10.0.0.49
+
 # Forum server
 
 +forum.openstreetmap.org:87.239.8.25
@@ -70,22 +114,28 @@
 # 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
++trac.openstreetmap.org:89.16.177.88
+#+wiki.openstreetmap.org:89.16.177.88
++foundation.openstreetmap.org:89.16.177.88
++irc.openstreetmap.org:89.16.177.88
+
 # 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
+
 # Our shop
 
 Cshop.openstreetmap.org:virtual.fotopic.net
-
-# Private LAN addresses for the UCL machines