Switch dev.osm.org back to errol - user pages are now redirected.

[dns.git] / openstreetmap.org

diff --git a/openstreetmap.org b/openstreetmap.org
index ff280a1e552faaa8da586d930e0e08b107943f37..e1f08224a295bd79ce04904549576dbfd31911de 100644 (file)
--- a/openstreetmap.org
+++ b/openstreetmap.org
@@ -19,12 +19,12 @@
 
 # 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
 
@@ -42,37 +42,45 @@
 
 # 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
 
-+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
 
-+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.ilo.openstreetmap.org:10.1.0.7
+
++yevaud.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
 
-+tah.openstreetmap.org:67.159.49.178
-+a.tah.openstreetmap.org:67.159.49.178
-+b.tah.openstreetmap.org:67.159.49.178
-+c.tah.openstreetmap.org:67.159.49.178
-+d.tah.openstreetmap.org:67.159.49.178
-+e.tah.openstreetmap.org:67.159.49.178
-+f.tah.openstreetmap.org:67.159.49.178
-+server.tah.openstreetmap.org:67.159.49.179
++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
 
 # Database server
 
-+db.internal.openstreetmap.org:10.0.0.6
++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
 
@@ -80,24 +88,39 @@
 
 # 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
++errol.internal.openstreetmap.org:10.0.0.14
++errol.ilo.openstreetmap.org:10.0.0.64
+
 # 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.openstreetmap.org:128.40.58.201
++munin.openstreetmap.org:128.40.168.96
 
 # 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
++ridley.openstreetmap.org:128.40.168.102
 +ridley.internal.openstreetmap.org:10.0.0.3
++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
 
@@ -128,6 +151,14 @@
 
 +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