X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/f7142f27e039d48206a67be72c6e6e5f6365606c..fdd32a9aeff1a82bc1fe89dbd7db785d49599508:/openstreetmap.org

diff --git a/openstreetmap.org b/openstreetmap.org
index 2cb835b..7ea20a2 100644
--- a/openstreetmap.org
+++ b/openstreetmap.org
@@ -12,6 +12,8 @@
 
 @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
 
@@ -40,10 +42,15 @@
 +rails3.internal.openstreetmap.org:10.0.0.12
 +norbert.ilo.openstreetmap.org:10.0.0.62
 
-# Gazetteer server
+# 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 (namefinder) server
 
 +gazetteer.openstreetmap.org:128.40.168.96
-+npe.openstreetmap.org:128.40.168.96
 +gazetteer.internal.openstreetmap.org:10.0.0.1
 
 # XAPI server
@@ -54,17 +61,22 @@
 
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
-+tile.openstreetmap.org:128.40.168.99
-+a.tile.openstreetmap.org:128.40.168.99
-+b.tile.openstreetmap.org:128.40.168.99
-+c.tile.openstreetmap.org:128.40.168.99
-+tile.internal.openstreetmap.org:10.0.0.7
-+tile.ilo.openstreetmap.org:10.1.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
 
+# Services machine
+
++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
+
 # Osmarender tile server, with wildcard alias to allow parallel loading
 
 +tah.openstreetmap.org:129.132.168.206
@@ -82,41 +94,41 @@
 +db.internal.openstreetmap.org:10.0.0.13:60
 +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
 
-+dev.openstreetmap.org:128.40.168.100
 +old-dev.openstreetmap.org:128.40.168.100
 +*.old-dev.openstreetmap.org:128.40.168.100
 +dev.internal.openstreetmap.org:10.0.0.5
 
 +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
-+errol.internal.openstreetmap.org:10.0.0.14
++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
 +errol.ilo.openstreetmap.org:10.0.0.64
 
-# Planet dumps are currently served from dev
+# Foundation server
 
-+planet.openstreetmap.org:128.40.168.100
++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
 
-# Munin currently operates from gazetteer
+# Planet dumps are currently served from horntail
 
-+munin.openstreetmap.org:128.40.168.96
++planet.openstreetmap.org:128.40.168.99
 
 # 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.openstreetmap.org:128.40.168.102
-+ridley.internal.openstreetmap.org:10.0.0.3
-+katie.openstreetmap.org:128.40.168.101
-+katie.internal.openstreetmap.org:10.0.0.6
 
 # APC power switch
 
@@ -124,7 +136,7 @@
 
 # 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
 
@@ -140,8 +152,8 @@
 +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
++idris.internal.openstreetmap.org:10.0.0.253
 
 # Wiki is currently fronted by Grant's proxy (short timeout to allow changes)