Update DNS to reflect new UCL IP addresses.

[dns.git] / openstreetmap.org

diff --git a/openstreetmap.org b/openstreetmap.org
index a801cc398fe9d6374c127a83a0c8bf72b9a2bc8f..fcb18f6563b8a12e55218b3c95412313fcecd745 100644 (file)
--- a/openstreetmap.org
+++ b/openstreetmap.org
@@ -19,12 +19,12 @@
 
 # Main web server and it's aliases
 
 
 # Main web server and it's aliases
 

-+puff.openstreetmap.org:128.40.58.203
-+openstreetmap.org:128.40.58.203
-+www.openstreetmap.org:128.40.58.203
-+api.openstreetmap.org:128.40.58.203
-+maps.openstreetmap.org:128.40.58.203
-+mapz.openstreetmap.org:128.40.58.203
++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
 
 +puff.internal.openstreetmap.org:10.0.0.8
 +puff.ilo.openstreetmap.org:10.0.0.58
 


@@ -42,22 +42,24 @@
 
 # Gazetteer server
 
 
 # Gazetteer server
 

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

 +gazetteer.internal.openstreetmap.org:10.0.0.1
 
 # XAPI server
 
 +gazetteer.internal.openstreetmap.org:10.0.0.1
 
 # XAPI server
 

-+fafnir.openstreetmap.org:128.40.58.202
-+xapi.openstreetmap.org:128.40.58.202
++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
 
 +fafnir.internal.openstreetmap.org:10.0.0.4
 
 # 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.openstreetmap.org:128.40.168.99
++a.tile.openstreetmap.org:128.40.168.99
++b.tile.openstreetmap.org:128.40.168.99
++c.tile.openstreetmap.org:128.40.168.99

 +tile.internal.openstreetmap.org:10.0.0.7
 +tile.internal.openstreetmap.org:10.0.0.7

++tile.ilo.openstreetmap.org:10.1.0.7

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


@@ -72,11 +74,8 @@
 
 # Database server
 
 
 # Database server
 

-+db.internal.openstreetmap.org:10.0.0.6
-
-# New database server
-

 +smaug.internal.openstreetmap.org:10.0.0.13
 +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
 
 # Backups are currently on tile
 +smaug.ilo.internal.openstreetmap.org:10.0.0.63
 
 # Backups are currently on tile


@@ -85,17 +84,17 @@
 
 # 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
++dev.openstreetmap.org:128.40.168.100
++*.dev.openstreetmap.org:128.40.168.100

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

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

 
 # Spare servers
 
 
 # Spare servers
 


@@ -103,9 +102,10 @@
 +fuchur.ilo.openstreetmap.org:10.0.0.59
 +dulcy.internal.openstreetmap.org:10.0.0.2
 +ridley.internal.openstreetmap.org:10.0.0.3
 +fuchur.ilo.openstreetmap.org:10.0.0.59
 +dulcy.internal.openstreetmap.org:10.0.0.2
 +ridley.internal.openstreetmap.org:10.0.0.3

++katie.internal.openstreetmap.org:10.0.0.6

 
 # APC power switch
 
 # APC power switch

-apc1.internal.openstreetmap.org:10.0.0.49
++apc1.internal.openstreetmap.org:10.0.0.49

 
 # Forum server
 
 
 # Forum server
 


@@ -135,6 +135,10 @@ apc1.internal.openstreetmap.org:10.0.0.49
 # Blog aggregator (on Shaun McDonald's VM)
 
 +blogs.openstreetmap.org:89.16.175.12
 # Blog aggregator (on Shaun McDonald's VM)
 
 +blogs.openstreetmap.org:89.16.175.12

+ 
+# Donation site
+
++donate.openstreetmap.org:89.145.67.86

 
 # Our shop
 
 
 # Our shop