X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/2c6ede3aa0c9acefab0ca350e2139823a83fecc4..96877151bbc039e1fff0a4afefa79b003b2522a8:/data/osm.org

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