Remove katie and move nominatim to poldi.

[dns.git] / data / openstreetmap.com

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