X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/2c6ede3aa0c9acefab0ca350e2139823a83fecc4..96877151bbc039e1fff0a4afefa79b003b2522a8:/data/openstreetmaps.org?ds=sidebyside

diff --git a/data/openstreetmaps.org b/data/openstreetmaps.org
index 6f5204a..a3a7225 100644
--- a/data/openstreetmaps.org
+++ b/data/openstreetmaps.org
@@ -10,26 +10,35 @@
 
 # Make the virtual machine the primary MX with Bytemark as backup
 
-@openstreetmaps.org:89.16.177.88:a:10
+@openstreetmaps.org:89.16.179.150:a:10
 @openstreetmaps.org::backup.mx.bytemark.co.uk:20
-@otrs.openstreetmaps.org:89.16.177.88:a:10
-@messages.openstreetmaps.org:89.16.177.88:a:10
+@otrs.openstreetmaps.org:89.16.179.150:a:10
+@messages.openstreetmaps.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
 
-'openstreetmaps.org:v=spf1 ip4\07289.16.177.88 ~all
+'openstreetmaps.org:v=spf1 ip4\07289.16.179.150 ~all
 
-# Main web server and it's aliases
+# Main web servers and their aliases
 
 +puff.openstreetmaps.org:128.40.168.98
-+openstreetmaps.org:128.40.168.98
-+www.openstreetmaps.org:128.40.168.98
-+api.openstreetmaps.org:128.40.168.98
-+maps.openstreetmaps.org:128.40.168.98
-+mapz.openstreetmaps.org:128.40.168.98
++openstreetmaps.org:128.40.168.98:3600
++www.openstreetmaps.org:128.40.168.98:3600
++api.openstreetmaps.org:128.40.168.98:3600
++maps.openstreetmaps.org:128.40.168.98:3600
++mapz.openstreetmaps.org:128.40.168.98:3600
 +puff.internal.openstreetmaps.org:10.0.0.8
 +puff.ilo.openstreetmaps.org:10.0.0.58
 
++fuchur.openstreetmaps.org:128.40.168.105
++openstreetmaps.org:128.40.168.105:3600
++www.openstreetmaps.org:128.40.168.105:3600
++api.openstreetmaps.org:128.40.168.105:3600
++maps.openstreetmaps.org:128.40.168.105:3600
++mapz.openstreetmaps.org:128.40.168.105:3600
++fuchur.internal.openstreetmaps.org:10.0.0.9
++fuchur.ilo.openstreetmaps.org:10.0.0.59
+
 # Rails application servers
 
 +draco.internal.openstreetmaps.org:10.0.0.10
@@ -62,10 +71,10 @@
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.openstreetmaps.org:128.40.168.104
-+tile.openstreetmaps.org:128.40.168.104
-+a.tile.openstreetmaps.org:128.40.168.104
-+b.tile.openstreetmaps.org:128.40.168.104
-+c.tile.openstreetmaps.org:128.40.168.104
++tile.openstreetmaps.org:128.40.168.104:3600
++a.tile.openstreetmaps.org:128.40.168.104:3600
++b.tile.openstreetmaps.org:128.40.168.104:3600
++c.tile.openstreetmaps.org:128.40.168.104:3600
 +yevaud.internal.openstreetmaps.org:10.0.0.15
 +yevaud.ilo.openstreetmaps.org:10.0.0.65
 
@@ -96,10 +105,6 @@
 
 # Development server with wildcard alias for user sites
 
-+old-dev.openstreetmaps.org:128.40.168.100
-+*.old-dev.openstreetmaps.org:128.40.168.100
-+old-dev.internal.openstreetmaps.org:10.0.0.5
-
 +errol.openstreetmaps.org:128.40.168.103
 +dev.openstreetmaps.org:128.40.168.103
 +*.dev.openstreetmaps.org:128.40.168.103
@@ -128,9 +133,6 @@
 
 # Spare servers
 
-+fuchur.openstreetmaps.org:128.40.168.105
-+fuchur.internal.openstreetmaps.org:10.0.0.9
-+fuchur.ilo.openstreetmaps.org:10.0.0.59
 +dulcy.internal.openstreetmaps.org:10.0.0.2
 
 # APC power switch
@@ -141,23 +143,17 @@
 
 +forum.openstreetmaps.org:93.186.179.231
 
-# Bytemark virtual machine, and the services which operate from it
-
-+vm.openstreetmaps.org:80.68.94.95
-+stats.wiki.openstreetmaps.org:80.68.94.95
-+vm.internal.openstreetmaps.org:10.0.0.253
-
-# Bytemark atom machine, and the services which operate from it
-
-+idris.openstreetmaps.org:89.16.177.88
-+mail.openstreetmaps.org:89.16.177.88
-+lists.openstreetmaps.org:89.16.177.88
-+svn.openstreetmaps.org:89.16.177.88
-+git.openstreetmaps.org:89.16.177.88
-+trac.openstreetmaps.org:89.16.177.88
-+irc.openstreetmaps.org:89.16.177.88
-+help.openstreetmaps.org:89.16.177.88
-+idris.internal.openstreetmaps.org:10.0.0.253
+# Bytemark machine, and the services which operate from it
+
++shenron.openstreetmaps.org:89.16.179.150
++mail.openstreetmaps.org:89.16.179.150
++lists.openstreetmaps.org:89.16.179.150
++svn.openstreetmaps.org:89.16.179.150
++git.openstreetmaps.org:89.16.179.150
++trac.openstreetmaps.org:89.16.179.150
++irc.openstreetmaps.org:89.16.179.150
++help.openstreetmaps.org:89.16.179.150
++shenron.internal.openstreetmaps.org:10.0.0.251
 
 # Wiki server