X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/6339894a70061efee4410cfce3a3bd6059001ff1..89ca7876106d4908369e068f9e00a11f619f8a22:/openstreetmap.org

diff --git a/openstreetmap.org b/openstreetmap.org
index 695278b..3f7e9b7 100644
--- 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,22 +42,31 @@
 
 # Gazetteer server
 
-+gazetteer.openstreetmap.org:128.40.58.201
++gazetteer.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.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
+
+# Services machine
+
++horntail.openstreetmap.org:128.40.168.99
++munin.openstreetmap.org:128.40.168.99
++horntail.internal.openstreetmap.org:10.0.0.7
++horntail.ilo.openstreetmap.org:10.1.0.7
 
 # Osmarender tile server, with wildcard alias to allow parallel loading
 
@@ -76,37 +85,46 @@
 +db.internal.openstreetmap.org:10.0.0.13:60
 +smaug.ilo.internal.openstreetmap.org:10.0.0.63
 
-# Old database server
-
-+old-db.internal.openstreetmap.org:10.0.0.6
-
 # Backups are currently on tile
 
 +backup.openstreetmap.org:10.0.0.7
 
 # 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
 
-# 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
++npe.openstreetmap.org:128.40.168.103
++errol.internal.openstreetmap.org:10.0.0.14
++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
++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 dev
+
++planet.openstreetmap.org:128.40.168.100
 
 # 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.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
+
++apc1.internal.openstreetmap.org:10.0.0.49
 
 # Forum server
 
@@ -126,7 +144,6 @@ apc1.internal.openstreetmap.org:10.0.0.49
 +svn.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
 
 # Wiki is currently fronted by Grant's proxy (short timeout to allow changes)
@@ -137,6 +154,14 @@ apc1.internal.openstreetmap.org:10.0.0.49
 
 +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