X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/fe11739231df9d080e30153edb1942192a3a218a..2d2bd78f3045a6050df623cb2f5488dc7ef0ea84:/src/openstreetmap diff --git a/src/openstreetmap b/src/openstreetmap index 9bab177..9211a6a 100644 --- a/src/openstreetmap +++ b/src/openstreetmap @@ -23,84 +23,92 @@ # Main web servers and their aliases -+puff.openstreetmap:128.40.168.98 -+openstreetmap:128.40.168.98:3600 -+www.openstreetmap:128.40.168.98:3600 -+api.openstreetmap:128.40.168.98:3600 -+maps.openstreetmap:128.40.168.98:3600 -+mapz.openstreetmap:128.40.168.98:3600 -+puff.internal.openstreetmap:10.0.0.8 -+puff.ilo.openstreetmap:10.0.0.58 - -+fuchur.openstreetmap:128.40.168.105 -+openstreetmap:128.40.168.105:3600 -+www.openstreetmap:128.40.168.105:3600 -+api.openstreetmap:128.40.168.105:3600 -+maps.openstreetmap:128.40.168.105:3600 -+mapz.openstreetmap:128.40.168.105:3600 -+fuchur.internal.openstreetmap:10.0.0.9 -+fuchur.ilo.openstreetmap:10.0.0.59 ++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 + ++fuchur.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 ++fuchur.ic.openstreetmap:146.179.159.163 ++fuchur.oob.openstreetmap:146.179.159.187 # Rails application servers -+draco.internal.openstreetmap:10.0.0.10 -+rails1.internal.openstreetmap:10.0.0.10 -+draco.ilo.openstreetmap:10.0.0.60 -+sarel.internal.openstreetmap:10.0.0.11 -+rails2.internal.openstreetmap:10.0.0.11 -+sarel.ilo.openstreetmap:10.0.0.61 -+norbert.internal.openstreetmap:10.0.0.12 -+rails3.internal.openstreetmap:10.0.0.12 -+norbert.ilo.openstreetmap:10.0.0.62 ++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 -+poldi.internal.openstreetmap:10.0.0.16 -+poldi.ilo.openstreetmap:10.0.0.66 -+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 # Gazetteer (namefinder) server +gazetteer.openstreetmap:128.40.168.96 -+gazetteer.internal.openstreetmap:10.0.0.1 ++gazetteer.ucl.openstreetmap:10.0.0.1 # XAPI server +fafnir.openstreetmap:128.40.168.97 +xapi.openstreetmap:128.40.168.97 -+fafnir.internal.openstreetmap:10.0.0.4 ++fafnir.ucl.openstreetmap:10.0.0.4 # OWL server +albi.openstreetmap:128.40.168.95 +owl.openstreetmap:128.40.168.95 -+albi.internal.openstreetmap:10.0.0.2 +albi.ilo.openstreetmap:10.0.0.52 ++albi.ucl.openstreetmap:10.0.0.2 ++albi.oob.openstreetmap:10.0.1.2 # Spare server +azure.openstreetmap:128.40.168.100 -+azure.internal.openstreetmap:10.0.0.5 ++jxapi.openstreetmap:128.40.168.100 +azure.ilo.openstreetmap:10.0.0.55 ++azure.ucl.openstreetmap:10.0.0.5 ++azure.oob.openstreetmap:10.0.1.5 # Mapnik tile server, with wildcard alias to allow parallel loading +yevaud.openstreetmap:128.40.168.104 -+tile.openstreetmap:128.40.168.104:3600 -+a.tile.openstreetmap:128.40.168.104:3600 -+b.tile.openstreetmap:128.40.168.104:3600 -+c.tile.openstreetmap:128.40.168.104:3600 -+yevaud.internal.openstreetmap:10.0.0.15 -+yevaud.ilo.openstreetmap:10.0.0.65 ++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 ++yevaud.ucl.openstreetmap:10.0.0.15 ++yevaud.oob.openstreetmap:10.0.1.15 # Services machine -+horntail.openstreetmap:128.40.168.99 -+munin.openstreetmap:128.40.168.99 -+backup.openstreetmap:10.0.0.7 -+horntail.internal.openstreetmap:10.0.0.7 -+horntail.ilo.openstreetmap:10.1.0.7 ++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 @@ -115,9 +123,9 @@ # Database server -+smaug.internal.openstreetmap:10.0.0.13 -+db.internal.openstreetmap:10.0.0.13:60 -+smaug.ilo.internal.openstreetmap:10.0.0.63 ++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 @@ -133,7 +141,8 @@ +a.os.openstreetmap:128.40.168.103 +b.os.openstreetmap:128.40.168.103 +c.os.openstreetmap:128.40.168.103 -+errol.ilo.openstreetmap:10.0.0.64 ++errol.ucl.openstreetmap:10.0.0.14 ++errol.oob.openstreetmap:10.0.1.14 # Foundation server @@ -141,17 +150,18 @@ +otrs.openstreetmap:128.40.168.102 +blog.openstreetmap:128.40.168.102 +foundation.openstreetmap:128.40.168.102 -+ridley.internal.openstreetmap:10.0.0.3 ++ridley.ucl.openstreetmap:10.0.0.3 -# Planet dumps are currently served from horntail +# APC power switches -+planet.openstreetmap:128.40.168.99 ++apc1.ucl.openstreetmap:10.0.0.49 ++apc2.ucl.openstreetmap:10.0.0.50 ++apc3.ucl.openstreetmap:10.0.0.51 -# APC power switch +# Managed network switches -+apc1.internal.openstreetmap:10.0.0.49 -+apc2.internal.openstreetmap:10.0.0.50 -+apc3.internal.openstreetmap:10.0.0.51 ++switch1.openstreetmap:193.63.75.102 ++switch2.ic.openstreetmap:146.179.159.169 # Forum server @@ -168,7 +178,7 @@ +irc.openstreetmap:89.16.179.150 +help.openstreetmap:89.16.179.150 +shop.openstreetmap:89.16.179.150 -+shenron.internal.openstreetmap:10.0.0.251 ++shenron.bm.openstreetmap:10.0.0.251 3shenron.openstreetmap:200141c800100996021d7dfffec3df70 3mail.openstreetmap:200141c800100996021d7dfffec3df70 @@ -176,21 +186,23 @@ 3svn.openstreetmap:200141c800100996021d7dfffec3df70 3git.openstreetmap:200141c800100996021d7dfffec3df70 3trac.openstreetmap:200141c800100996021d7dfffec3df70 -3irc.openstreetmap:200141c800100996021d7dfffec3df70 3help.openstreetmap:200141c800100996021d7dfffec3df70 3shop.openstreetmap:200141c800100996021d7dfffec3df70 # Wiki server -+konqi.openstreetmap:193.63.75.26 -+konqi.ilo.openstreetmap:193.63.75.27 -+konqi.internal.openstreetmap:10.0.0.252 -+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 # Tile cache server +orm.openstreetmap:193.63.75.98 +#+orm.ic.openstreetmap:10.0.16.2 +#+orm.oob.openstreetmap:10.0.17.2 # Blog aggregator (on Shaun McDonald's VM) @@ -207,3 +219,8 @@ # HOT site +hot.openstreetmap:69.163.129.108 + +# Jochen Topf's taginfo service, running on openstreetmap.de hardware + ++taginfo.openstreetmap:85.214.118.227 +3taginfo.openstreetmap:2a0102384000000003cac7808a7d7be2