X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/d1b72774de56d34f1ebd9ace74b48c51af97fb9d..ed7230a41642052e2818f4c1b9f12a42d4ef496d:/data/osm.org diff --git a/data/osm.org b/data/osm.org index a8b925b..f9eedd3 100644 --- a/data/osm.org +++ b/data/osm.org @@ -12,79 +12,103 @@ @osm.org:89.16.179.150:a:10 @osm.org::backup.mx.bytemark.co.uk:20 -@otrs.osm.org:89.16.179.150:a:10 -@messages.osm.org:89.16.179.150:a:10 +@otrs.osm.org::a.mx.osm.org:10 +@messages.osm.org::a.mx.osm.org:10 -# Publish an SPF record indicating that only idris sends mail +3a.mx.osm.org:200141c800100996021d7dfffec3df70 -'osm.org:v=spf1 ip4\07289.16.179.150 ~all +# Publish an SPF record indicating that only shenron sends mail + +'osm.org:v=spf1 ip4\07289.16.179.150 ip6\0722001\07241c8\07210\072996\07221d\0727dff\072fec3\072df70 ~all # 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.internal.osm.org:10.0.0.8 -+puff.ilo.osm.org:10.0.0.58 - -+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.internal.osm.org:10.0.0.9 -+fuchur.ilo.osm.org:10.0.0.59 ++puff.osm.org:128.40.168.98:600 ++osm.org:128.40.168.98:600 ++www.osm.org:128.40.168.98:600 ++api.osm.org:128.40.168.98:600 ++maps.osm.org:128.40.168.98:600 ++mapz.osm.org:128.40.168.98:600 ++puff.ucl.osm.org:10.0.0.8 ++puff.oob.osm.org:10.0.1.8:600 + ++fuchur.osm.org:128.40.168.105:600 ++osm.org:128.40.168.105:600 ++www.osm.org:128.40.168.105:600 ++api.osm.org:128.40.168.105:600 ++maps.osm.org:128.40.168.105:600 ++mapz.osm.org:128.40.168.105:600 ++fuchur.ucl.osm.org:10.0.0.9 ++fuchur.oob.osm.org:10.0.1.9:600 # Rails application servers -+draco.internal.osm.org:10.0.0.10 -+rails1.internal.osm.org:10.0.0.10 -+draco.ilo.osm.org:10.0.0.60 -+sarel.internal.osm.org:10.0.0.11 -+rails2.internal.osm.org:10.0.0.11 -+sarel.ilo.osm.org:10.0.0.61 -+norbert.internal.osm.org:10.0.0.12 -+rails3.internal.osm.org:10.0.0.12 -+norbert.ilo.osm.org:10.0.0.62 ++draco.ucl.osm.org:10.0.0.10 ++rails1.ucl.osm.org:10.0.0.10 ++draco.oob.osm.org:10.0.1.10:600 ++sarel.ucl.osm.org:10.0.0.11 ++rails2.ucl.osm.org:10.0.0.11 ++sarel.oob.osm.org:10.0.1.11:600 ++norbert.ucl.osm.org:10.0.0.12 ++rails3.ucl.osm.org:10.0.0.12 ++norbert.oob.osm.org:10.0.1.12:600 # Gazetteer (nominatim) server -+katie.osm.org:128.40.168.101 -+katie.internal.osm.org:10.0.0.6 -+nominatim.osm.org:128.40.168.101 ++poldi.osm.org:128.40.168.106 ++nominatim.osm.org:128.40.168.106 ++poldi.ucl.osm.org:10.0.0.16 ++poldi.oob.osm.org:10.0.1.16 # Gazetteer (namefinder) server +gazetteer.osm.org:128.40.168.96 -+gazetteer.internal.osm.org:10.0.0.1 ++gazetteer.ucl.osm.org:10.0.0.1 # XAPI server +fafnir.osm.org:128.40.168.97 +xapi.osm.org:128.40.168.97 -+fafnir.internal.osm.org:10.0.0.4 ++fafnir.ucl.osm.org:10.0.0.4 + +# OWL server + ++albi.osm.org:128.40.168.95 ++owl.osm.org:128.40.168.95 ++albi.ilo.osm.org:10.0.0.52 ++albi.ucl.osm.org:10.0.0.2 ++albi.oob.osm.org:10.0.1.2 + +# Spare server + ++azure.osm.org:128.40.168.100 ++jxapi.osm.org:128.40.168.100 ++azure.ilo.osm.org:10.0.0.55 ++azure.ucl.osm.org:10.0.0.5 ++azure.oob.osm.org:10.0.1.5 # Mapnik tile server, with wildcard alias to allow parallel loading +yevaud.osm.org:128.40.168.104 -+tile.osm.org:128.40.168.104:3600 -+a.tile.osm.org:128.40.168.104:3600 -+b.tile.osm.org:128.40.168.104:3600 -+c.tile.osm.org:128.40.168.104:3600 -+yevaud.internal.osm.org:10.0.0.15 -+yevaud.ilo.osm.org:10.0.0.65 ++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 ++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 -+munin.osm.org:128.40.168.99 -+backup.osm.org:10.0.0.7 -+horntail.internal.osm.org:10.0.0.7 -+horntail.ilo.osm.org:10.1.0.7 ++horntail.osm.org:128.40.168.99:600 ++planet.osm.org:128.40.168.99:600 ++munin.osm.org:128.40.168.99:600 ++apt.osm.org:128.40.168.99:600 ++stats.osm.org:128.40.168.99:600 ++chef.osm.org:128.40.168.99:600 ++backup.osm.org:128.40.168.99:600 ++horntail.ucl.osm.org:10.0.0.7 ++backup.ucl.osm.org:10.0.0.7 ++horntail.oob.osm.org:10.0.1.7:600 # Osmarender tile server, with wildcard alias to allow parallel loading @@ -99,16 +123,12 @@ # Database server -+smaug.internal.osm.org:10.0.0.13 -+db.internal.osm.org:10.0.0.13:60 -+smaug.ilo.internal.osm.org:10.0.0.63 ++smaug.ucl.osm.org:10.0.0.13 ++db.ucl.osm.org:10.0.0.13 ++smaug.oob.osm.org:10.0.1.13:600 # Development server with wildcard alias for user sites -+old-dev.osm.org:128.40.168.100 -+*.old-dev.osm.org:128.40.168.100 -+old-dev.internal.osm.org:10.0.0.5 - +errol.osm.org:128.40.168.103 +dev.osm.org:128.40.168.103 +*.dev.osm.org:128.40.168.103 @@ -121,7 +141,8 @@ +a.os.osm.org:128.40.168.103 +b.os.osm.org:128.40.168.103 +c.os.osm.org:128.40.168.103 -+errol.ilo.osm.org:10.0.0.64 ++errol.ucl.osm.org:10.0.0.14 ++errol.oob.osm.org:10.0.1.14 # Foundation server @@ -129,24 +150,13 @@ +otrs.osm.org:128.40.168.102 +blog.osm.org:128.40.168.102 +foundation.osm.org:128.40.168.102 -+ridley.internal.osm.org:10.0.0.3 - -# Planet dumps are currently served from horntail - -+planet.osm.org:128.40.168.99 - -# Spare servers - -+dulcy.internal.osm.org:10.0.0.2 - -+idris.osm.org:89.16.177.88 -+idris.internal.osm.org:10.0.0.253 - -+vm.osm.org:80.68.94.95 ++ridley.ucl.osm.org:10.0.0.3 # APC power switch -+apc1.internal.osm.org:10.0.0.49 ++apc1.ucl.osm.org:10.0.0.49 ++apc2.ucl.osm.org:10.0.0.50 ++apc3.ucl.osm.org:10.0.0.51 # Forum server @@ -162,15 +172,32 @@ +trac.osm.org:89.16.179.150 +irc.osm.org:89.16.179.150 +help.osm.org:89.16.179.150 -+shenron.internal.osm.org:10.0.0.251 ++shop.osm.org:89.16.179.150 ++shenron.bm.osm.org:10.0.0.251 + +3shenron.osm.org:200141c800100996021d7dfffec3df70 +3mail.osm.org:200141c800100996021d7dfffec3df70 +3lists.osm.org:200141c800100996021d7dfffec3df70 +3svn.osm.org:200141c800100996021d7dfffec3df70 +3git.osm.org:200141c800100996021d7dfffec3df70 +3trac.osm.org:200141c800100996021d7dfffec3df70 +3help.osm.org:200141c800100996021d7dfffec3df70 +3shop.osm.org:200141c800100996021d7dfffec3df70 # Wiki server +konqi.osm.org:193.63.75.26 +konqi.ilo.osm.org:193.63.75.27 -+konqi.internal.osm.org:10.0.0.252 +wiki.osm.org:193.63.75.26 +dump.wiki.osm.org:193.63.75.26 +#+konqi.ic.osm.org:10.0.16.1 +#+konqi.oob.osm.org:10.0.17.1 + +# Tile cache server + ++orm.osm.org:193.63.75.98 +#+orm.ic.osm.org:10.0.16.2 +#+orm.oob.osm.org:10.0.17.2 # Blog aggregator (on Shaun McDonald's VM) @@ -184,10 +211,11 @@ +donate.osm.org:89.145.67.86 -# Our shop - -Cshop.osm.org:virtual.fotopic.net - # HOT site +hot.osm.org:69.163.129.108 + +# Jochen Topf's taginfo service, running on osm.org.de hardware + ++taginfo.osm.org:85.214.118.227 +3taginfo.osm.org:2a0102384000000003cac7808a7d7be2