Add parent.tile.osm.org

[dns.git] / src / openstreetmap

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