Add fuchur back into the www alias

[dns.git] / data / openstreetmaps.org

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