Add DNS entry for git.openstreetmap.org.

[dns.git] / openstreetmap.org

diff --git a/openstreetmap.org b/openstreetmap.org
index 68243df3c5d6cef6d32b76112df31b92c7967443..51f9d39c09c8f68785dc4ff1c723ff0dfe8b1b75 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
 
 @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
 
 
 # Publish an SPF record indicating that only idris sends mail
 


@@ -19,75 +21,126 @@
 
 # Main web server and it's aliases
 
 
 # Main web server and it's aliases
 

-+openstreetmap.org:128.40.58.202
-+www.openstreetmap.org:128.40.58.202
-+api.openstreetmap.org:128.40.58.202
-+maps.openstreetmap.org:128.40.58.202
-+mapz.openstreetmap.org:128.40.58.202
-+www.internal.openstreetmap.org:10.0.0.2
++puff.openstreetmap.org:128.40.168.98
++openstreetmap.org:128.40.168.98
++www.openstreetmap.org:128.40.168.98
++api.openstreetmap.org:128.40.168.98
++maps.openstreetmap.org:128.40.168.98
++mapz.openstreetmap.org:128.40.168.98
++puff.internal.openstreetmap.org:10.0.0.8
++puff.ilo.openstreetmap.org:10.0.0.58

 
 # Rails application servers
 
 
 # Rails application servers
 

-+rails1.internal.openstreetmap.org:10.0.0.3
-+rails2.internal.openstreetmap.org:10.0.0.4
++draco.internal.openstreetmap.org:10.0.0.10
++rails1.internal.openstreetmap.org:10.0.0.10
++draco.ilo.openstreetmap.org:10.0.0.60
++sarel.internal.openstreetmap.org:10.0.0.11
++rails2.internal.openstreetmap.org:10.0.0.11
++sarel.ilo.openstreetmap.org:10.0.0.61
++norbert.internal.openstreetmap.org:10.0.0.12
++rails3.internal.openstreetmap.org:10.0.0.12
++norbert.ilo.openstreetmap.org:10.0.0.62
+
+# 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 server
+# Gazetteer (namefinder) server

 
 

-+gazetteer.openstreetmap.org:128.40.58.201
++gazetteer.openstreetmap.org:128.40.168.96

 +gazetteer.internal.openstreetmap.org:10.0.0.1
 
 +gazetteer.internal.openstreetmap.org:10.0.0.1
 

+# XAPI server
+
++fafnir.openstreetmap.org:128.40.168.97
++xapi.openstreetmap.org:128.40.168.97
++fafnir.internal.openstreetmap.org:10.0.0.4
+

 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 # Mapnik tile server, with wildcard alias to allow parallel loading
 

-+tile.openstreetmap.org:128.40.58.204
-+a.tile.openstreetmap.org:128.40.58.204
-+b.tile.openstreetmap.org:128.40.58.204
-+c.tile.openstreetmap.org:128.40.58.204
-+tile.internal.openstreetmap.org:10.0.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

 
 

-# Osmarender tile server, with wildcard alias to allow parallel loading
+# Services machine

 
 

-+tah.openstreetmap.org:137.110.119.130
-+*.tah.openstreetmap.org:137.110.119.130
++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

 
 

-# Database server
+# Osmarender tile server, with wildcard alias to allow parallel loading

 
 

-+db.internal.openstreetmap.org:10.0.0.6
++tah.openstreetmap.org:129.132.168.206
++a.tah.openstreetmap.org:129.132.168.206
++b.tah.openstreetmap.org:129.132.168.206
++c.tah.openstreetmap.org:129.132.168.206
++d.tah.openstreetmap.org:129.132.168.206
++e.tah.openstreetmap.org:129.132.168.206
++f.tah.openstreetmap.org:129.132.168.206
++server.tah.openstreetmap.org:129.132.168.206

 
 

-# Backups are currently on rails2
+# Database server

 
 

-+backup.openstreetmap.org:10.0.0.4
++smaug.internal.openstreetmap.org:10.0.0.13
++db.internal.openstreetmap.org:10.0.0.13:60
++smaug.ilo.internal.openstreetmap.org:10.0.0.63

 
 # Development server with wildcard alias for user sites
 
 
 # Development server with wildcard alias for user sites
 

-+dev.openstreetmap.org:128.40.58.205
-+*.dev.openstreetmap.org:128.40.58.205
++old-dev.openstreetmap.org:128.40.168.100
++*.old-dev.openstreetmap.org:128.40.168.100

 +dev.internal.openstreetmap.org:10.0.0.5
 
 +dev.internal.openstreetmap.org:10.0.0.5
 

-# Planet dumps are currently served from dev
++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
++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

 
 

-+planet.openstreetmap.org:128.40.58.205
+# Foundation server

 
 

-# Munin currently operates from gazetteer
++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.openstreetmap.org:128.40.58.201
+# Planet dumps are currently served from horntail

 
 

-# New HP servers
++planet.openstreetmap.org:128.40.168.99
+
+# Spare servers

 
 

-+puff.openstreetmap.org:128.40.58.203
-+puff.internal.openstreetmap.org:10.0.0.8
-+puff.ilo.openstreetmap.org:10.0.0.58

 +fuchur.internal.openstreetmap.org:10.0.0.9
 +fuchur.ilo.openstreetmap.org:10.0.0.59
 +fuchur.internal.openstreetmap.org:10.0.0.9
 +fuchur.ilo.openstreetmap.org:10.0.0.59

-+draco.internal.openstreetmap.org:10.0.0.10
-+draco.ilo.openstreetmap.org:10.0.0.60
-+sarel.internal.openstreetmap.org:10.0.0.11
-+sarel.ilo.openstreetmap.org:10.0.0.61
-+norbert.internal.openstreetmap.org:10.0.0.12
-+norbert.ilo.openstreetmap.org:10.0.0.62
++dulcy.internal.openstreetmap.org:10.0.0.2
+
+# APC power switch
+
++apc1.internal.openstreetmap.org:10.0.0.49

 
 # Forum server
 
 
 # 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
 
 
 # Bytemark virtual machine, and the services which operate from it
 


@@ -101,10 +154,18 @@
 +mail.openstreetmap.org:89.16.177.88
 +lists.openstreetmap.org:89.16.177.88
 +svn.openstreetmap.org:89.16.177.88
 +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
 +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
 +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
++dump.wiki.openstreetmap.org:193.63.75.26

 
 # Wiki is currently fronted by Grant's proxy (short timeout to allow changes)
 
 
 # Wiki is currently fronted by Grant's proxy (short timeout to allow changes)
 


@@ -114,6 +175,14 @@
 
 +blogs.openstreetmap.org:89.16.175.12
 
 
 +blogs.openstreetmap.org:89.16.175.12
 

+# Cruise (on Shaun McDonald's VM)
+
++cruise.openstreetmap.org:89.16.175.12
+ 
+# Donation site
+
++donate.openstreetmap.org:89.145.67.86
+

 # Our shop
 
 Cshop.openstreetmap.org:virtual.fotopic.net
 # Our shop
 
 Cshop.openstreetmap.org:virtual.fotopic.net