Point docs.osmfoundation.org at ghs.google.com.

[dns.git] / openstreetmap.org

diff --git a/openstreetmap.org b/openstreetmap.org
index 3f7e9b7a6e055a41b5d670d33a4a57c7026e555c..cb75f3f8fd8b13252c0785a46312d562b3e1ae6a 100644 (file)
--- 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,7 +42,13 @@
 +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
 +gazetteer.internal.openstreetmap.org:10.0.0.1
@@ -65,6 +73,7 @@
 
 +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
 
@@ -85,10 +94,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
@@ -100,27 +105,30 @@
 +*.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
 
-# Planet dumps are currently served from dev
+# Planet dumps are currently served from horntail
 
-+planet.openstreetmap.org:128.40.168.100
++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
-+katie.openstreetmap.org:128.40.168.101
-+katie.internal.openstreetmap.org:10.0.0.6
 
 # APC power switch
 
@@ -128,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
 
@@ -145,6 +153,13 @@
 +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 server
+
++konqi.openstreetmap.org:193.63.75.26
++konqi.ilo.openstreetmap.org:193.63.75.27
++konqi.internal.openstreetmap.org:10.0.0.252
 
 # Wiki is currently fronted by Grant's proxy (short timeout to allow changes)