add blog.openstreetmap.org per request of Blackadder, complaints to him.

[dns.git] / openstreetmap.org

diff --git a/openstreetmap.org b/openstreetmap.org
index 362b0c7d44a8fb9df24f9d2c692813ac285f7457..e564ee472c51568576af7144c63881bdfb7719a1 100644 (file)
--- a/openstreetmap.org
+++ b/openstreetmap.org
@@ -10,80 +10,162 @@
 
 # Make the virtual machine the primary MX with Bytemark as backup
 
 
 # Make the virtual machine the primary MX with Bytemark as backup
 

-@openstreetmap.org:80.68.94.95:a:10
+@openstreetmap.org:89.16.177.88:a:10

 @openstreetmap.org::backup.mx.bytemark.co.uk:20
 @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
+
+'openstreetmap.org:v=spf1 ip4\07289.16.177.88 ~all

 
 # 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
++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

 
 

-# Mapnik tile server, with wildcard alias to allow parallel loading
+# Rails application servers

 
 

-+tile.openstreetmap.org:128.40.58.201
-+*.tile.openstreetmap.org:128.40.58.201
++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

 
 

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

 
 

-+tah.openstreetmap.org:137.110.119.130
-+*.tah.openstreetmap.org:137.110.119.130
++gazetteer.openstreetmap.org:128.40.168.96
++gazetteer.internal.openstreetmap.org:10.0.0.1

 
 

-# Database server
+# 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
+
++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

 
 

-+db.openstreetmap.org:128.40.58.203
+# Services machine

 
 

-# Old database server (currently rails application server)
++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

 
 

-+db2.openstreetmap.org:128.40.58.204
+# Osmarender tile server, with wildcard alias to allow parallel loading

 
 

-# Backups are currently on db2
++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

 
 

-+backup.openstreetmap.org:10.0.0.3
+# Database server
+
++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
+
++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.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 dev
 

-+planet.openstreetmap.org:128.40.58.205
++planet.openstreetmap.org:128.40.168.100

 
 

-# Munin currently operates from tile
+# Spare servers

 
 

-+munin.openstreetmap.org:128.40.58.201
++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
+
++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
 
 +vm.openstreetmap.org:80.68.94.95
 
 # Bytemark virtual machine, and the services which operate from it
 
 +vm.openstreetmap.org:80.68.94.95

-+mail.openstreetmap.org:80.68.94.95
-+lists.openstreetmap.org:80.68.94.95
-+svn.openstreetmap.org:80.68.94.95
-+trac.openstreetmap.org:80.68.94.95
-#+wiki.openstreetmap.org:80.68.94.95

 +stats.wiki.openstreetmap.org:80.68.94.95
 +stats.wiki.openstreetmap.org:80.68.94.95

-+foundation.openstreetmap.org:80.68.94.95
-+irc.openstreetmap.org:80.68.94.95
++vm.internal.openstreetmap.org:10.0.0.253
+
+# Bytemark atom machine, and the services which operate from it
+
++idris.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
++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)
 
 +wiki.openstreetmap.org:89.145.68.232:3600
 
 
 # Wiki is currently fronted by Grant's proxy (short timeout to allow changes)
 
 +wiki.openstreetmap.org:89.145.68.232:3600
 

-# Our shop
+# Blog aggregator (on Shaun McDonald's VM)

 
 

-Cshop.openstreetmap.org:virtual.fotopic.net
++blogs.openstreetmap.org:89.16.175.12

 
 

-# Private LAN addresses for the UCL machines
+# Cruise (on Shaun McDonald's VM)

 
 

-+tile.internal.openstreetmap.org:10.0.0.1
-+www.internal.openstreetmap.org:10.0.0.2
-+db2.internal.openstreetmap.org:10.0.0.3
-+tilegen.internal.openstreetmap.org:10.0.0.4
-+dev.internal.openstreetmap.org:10.0.0.5
-+db.internal.openstreetmap.org:10.0.0.6
-+vm.internal.openstreetmap.org:10.0.0.253
++cruise.openstreetmap.org:89.16.175.12
+ 
+# Donation site
+
++donate.openstreetmap.org:89.145.67.86
+
+# Our shop
+
+Cshop.openstreetmap.org:virtual.fotopic.net