X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/d3f79d30f3f4581fe70a991f5b7b5487af924415..f32736b4b4b94bed2fdce16cc5c66e6d94758e1a:/data/osm.org

diff --git a/data/osm.org b/data/osm.org
index ffb2e1c..da71f79 100644
--- a/data/osm.org
+++ b/data/osm.org
@@ -23,40 +23,40 @@
 
 # Main web servers and their aliases
 
-+puff.osm.org:128.40.168.98
-+osm.org:128.40.168.98:3600
-+www.osm.org:128.40.168.98:3600
-+api.osm.org:128.40.168.98:3600
-+maps.osm.org:128.40.168.98:3600
-+mapz.osm.org:128.40.168.98:3600
-+puff.ucl.osm.org:10.0.0.8
-+puff.oob.osm.org:10.0.1.8
-
-+fuchur.osm.org:128.40.168.105
-+osm.org:128.40.168.105:3600
-+www.osm.org:128.40.168.105:3600
-+api.osm.org:128.40.168.105:3600
-+maps.osm.org:128.40.168.105:3600
-+mapz.osm.org:128.40.168.105:3600
-+fuchur.ucl.osm.org:10.0.0.9
-+fuchur.oob.osm.org:10.0.1.9
++puff.osm.org:193.63.75.99
++osm.org:193.63.75.99:600
++www.osm.org:193.63.75.99:600
++api.osm.org:193.63.75.99:600
++maps.osm.org:193.63.75.99:600
++mapz.osm.org:193.63.75.99:600
++puff.ic.osm.org:146.179.159.162
++puff.oob.osm.org:146.179.159.188
+
++fuchur.osm.org:193.63.75.100
++osm.org:193.63.75.100:600
++www.osm.org:193.63.75.100:600
++api.osm.org:193.63.75.100:600
++maps.osm.org:193.63.75.100:600
++mapz.osm.org:193.63.75.100:600
++fuchur.ic.osm.org:146.179.159.163
++fuchur.oob.osm.org:146.179.159.187
 
 # Rails application servers
 
-+draco.ucl.osm.org:10.0.0.10
-+rails1.ucl.osm.org:10.0.0.10
-+draco.oob.osm.org:10.0.1.10
-+sarel.ucl.osm.org:10.0.0.11
-+rails2.ucl.osm.org:10.0.0.11
-+sarel.oob.osm.org:10.0.1.11
-+norbert.ucl.osm.org:10.0.0.12
-+rails3.ucl.osm.org:10.0.0.12
-+norbert.oob.osm.org:10.0.1.12
++draco.ic.osm.org:146.179.159.165
++rails1.ic.osm.org:146.179.159.165
++draco.oob.osm.org:146.179.159.185
++sarel.ic.osm.org:146.179.159.166
++rails2.ic.osm.org:146.179.159.166
++sarel.oob.osm.org:146.179.159.184
++norbert.ic.osm.org:146.179.159.167
++rails3.ic.osm.org:146.179.159.167
++norbert.oob.osm.org:146.179.159.183
 
 # Gazetteer (nominatim) server
 
 +poldi.osm.org:128.40.168.106 
-+nominatim.osm.org:128.40.168.106
++nominatim.osm.org:193.63.75.98:600
 +poldi.ucl.osm.org:10.0.0.16
 +poldi.oob.osm.org:10.0.1.16
 
@@ -90,25 +90,25 @@
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.osm.org:128.40.168.104
-+tile.osm.org:193.63.75.26:1800
-+a.tile.osm.org:193.63.75.26:900
-+b.tile.osm.org:128.40.168.95:900
-+c.tile.osm.org:128.40.168.95:900
++tile.osm.org:193.63.75.26:600
++a.tile.osm.org:193.63.75.26:600
++b.tile.osm.org:128.40.168.95:600
++c.tile.osm.org:128.40.168.95:600
 +yevaud.ucl.osm.org:10.0.0.15
 +yevaud.oob.osm.org:10.0.1.15
 
 # Services machine
 
-+horntail.osm.org:128.40.168.99
-+planet.osm.org:128.40.168.99
-+munin.osm.org:128.40.168.99
-+apt.osm.org:128.40.168.99
-+stats.osm.org:128.40.168.99
-+chef.osm.org:128.40.168.99
-+backup.osm.org:128.40.168.99
-+horntail.ucl.osm.org:10.0.0.7
-+backup.ucl.osm.org:10.0.0.7
-+horntail.oob.osm.org:10.0.1.7
++horntail.osm.org:193.63.75.101
++planet.osm.org:193.63.75.101
++munin.osm.org:193.63.75.101
++apt.osm.org:193.63.75.101
++stats.osm.org:193.63.75.101
++chef.osm.org:193.63.75.101
++backup.osm.org:193.63.75.101
++horntail.ic.osm.org:146.179.159.164
++backup.ic.osm.org:146.179.159.164
++horntail.oob.osm.org:146.179.159.186
 
 # Osmarender tile server, with wildcard alias to allow parallel loading
 
@@ -123,9 +123,9 @@
 
 # Database server
 
-+smaug.ucl.osm.org:10.0.0.13
-+db.ucl.osm.org:10.0.0.13:60
-+smaug.oob.osm.org:10.0.1.13
++smaug.ic.osm.org:146.179.159.168
++db.ic.osm.org:146.179.159.168
++smaug.oob.osm.org:146.179.159.182
 
 # Development server with wildcard alias for user sites
 
@@ -152,12 +152,22 @@
 +foundation.osm.org:128.40.168.102
 +ridley.ucl.osm.org:10.0.0.3
 
-# APC power switch
+# Spare machines
++fiddlestick.ucl.osm.org.org:10.0.0.7
++soup.ucl.osm.org.org:10.0.0.8
++eustace.ucl.osm.org.org:10.0.0.9
+
+# APC power switches
 
 +apc1.ucl.osm.org:10.0.0.49
 +apc2.ucl.osm.org:10.0.0.50
 +apc3.ucl.osm.org:10.0.0.51
 
+# Managed network switches
+
++switch1.osm.org:193.63.75.102
++switch2.ic.osm.org:146.179.159.169
+
 # Forum server
 
 +forum.osm.org:93.186.179.231
@@ -186,10 +196,10 @@
 
 # Wiki server
 
-+konqi.osm.org:193.63.75.26
-+konqi.ilo.osm.org:193.63.75.27
-+wiki.osm.org:193.63.75.26
-+dump.wiki.osm.org:193.63.75.26
++konqi.osm.org:193.63.75.26:600
++konqi.ilo.osm.org:193.63.75.27:600
++wiki.osm.org:193.63.75.26:600
++dump.wiki.osm.org:193.63.75.26:600
 #+konqi.ic.osm.org:10.0.16.1
 #+konqi.oob.osm.org:10.0.17.1