Tidy up some openstreetmap.org DNS entries.

[dns.git] / openstreetmap.org

diff --git a/openstreetmap.org b/openstreetmap.org
index c6d32c58c709e526ce307cd242cc062ac0ab9d34..a14a57b3df4167b6914e9a8be5c8d1b1cde0f0f1 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
@@ -90,34 +98,40 @@
 
 +old-dev.openstreetmap.org:128.40.168.100
 +*.old-dev.openstreetmap.org:128.40.168.100
-+dev.internal.openstreetmap.org:10.0.0.5
++old-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
++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
++os.openstreetmap.org:128.40.168.103
++a.os.openstreetmap.org:128.40.168.103
++b.os.openstreetmap.org:128.40.168.103
++c.os.openstreetmap.org:128.40.168.103
 +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.openstreetmap.org:128.40.168.105
 +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
 
@@ -125,7 +139,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
 
@@ -139,9 +153,18 @@
 +mail.openstreetmap.org:89.16.177.88
 +lists.openstreetmap.org:89.16.177.88
 +svn.openstreetmap.org:89.16.177.88
++git.openstreetmap.org:89.16.177.88
 +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.openstreetmap.org:193.63.75.26
++dump.wiki.openstreetmap.org:193.63.75.26
 
 # Wiki is currently fronted by Grant's proxy (short timeout to allow changes)
 
@@ -162,3 +185,7 @@
 # Our shop
 
 Cshop.openstreetmap.org:virtual.fotopic.net
+
+# HOT site
+
++hot.openstreetmap.org:69.163.129.108