X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/38ee01085a4b668cc59e04e28f8a7bb609d53f38..527c9b559e4f969218abe0a40b97cd6617f212c5:/openstreetmap.org

diff --git a/openstreetmap.org b/openstreetmap.org
index eb990a7..e564ee4 100644
--- a/openstreetmap.org
+++ b/openstreetmap.org
@@ -12,6 +12,7 @@
 
 @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
 
 # Publish an SPF record indicating that only idris sends mail
 
@@ -61,9 +62,13 @@
 +yevaud.internal.openstreetmap.org:10.0.0.15
 +yevaud.ilo.openstreetmap.org:10.0.0.65
 
-+old-tile.openstreetmap.org:128.40.168.99
-+old-tile.internal.openstreetmap.org:10.0.0.7
-+old-tile.ilo.openstreetmap.org:10.1.0.7
+# 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
 
@@ -82,10 +87,6 @@
 +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
 
 +old-dev.openstreetmap.org:128.40.168.100
@@ -97,13 +98,18 @@
 +*.dev.openstreetmap.org:128.40.168.103
 +new-dev.openstreetmap.org:128.40.168.103
 +*.new-dev.openstreetmap.org:128.40.168.103
++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.internal.openstreetmap.org:10.0.0.14
 +errol.ilo.openstreetmap.org:10.0.0.64
 
 # Foundation server
 
 +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
 
@@ -111,10 +117,6 @@
 
 +planet.openstreetmap.org:128.40.168.100
 
-# Munin currently operates from gazetteer
-
-+munin.openstreetmap.org:128.40.168.96
-
 # Spare servers
 
 +fuchur.internal.openstreetmap.org:10.0.0.9
@@ -129,7 +131,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
 
@@ -146,6 +148,7 @@
 +trac.openstreetmap.org:89.16.177.88
 #+wiki.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)