X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/7219868be65672085c73565e98049aec2ac9a52a..8c525b0cb0377e09da6eae3cb92b5f3097fe0156:/openstreetmap.org diff --git a/openstreetmap.org b/openstreetmap.org index 576fd7b..bb49074 100644 --- a/openstreetmap.org +++ b/openstreetmap.org @@ -12,6 +12,8 @@ @openstreetmap.org:89.16.177.88:a:10 @openstreetmap.org::backup.mx.bytemark.co.uk:20 +@otrs.openstreetmap.org:89.16.177.88:a:10 +@messages.openstreetmap.org:89.16.177.88:a:10 # Publish an SPF record indicating that only idris sends mail @@ -19,12 +21,12 @@ # Main web server and it's aliases -+puff.openstreetmap.org:128.40.58.203 -+openstreetmap.org:128.40.58.203 -+www.openstreetmap.org:128.40.58.203 -+api.openstreetmap.org:128.40.58.203 -+maps.openstreetmap.org:128.40.58.203 -+mapz.openstreetmap.org:128.40.58.203 ++puff.openstreetmap.org:128.40.168.98 ++openstreetmap.org:128.40.168.98 ++www.openstreetmap.org:128.40.168.98 ++api.openstreetmap.org:128.40.168.98 ++maps.openstreetmap.org:128.40.168.98 ++mapz.openstreetmap.org:128.40.168.98 +puff.internal.openstreetmap.org:10.0.0.8 +puff.ilo.openstreetmap.org:10.0.0.58 @@ -40,58 +42,104 @@ +rails3.internal.openstreetmap.org:10.0.0.12 +norbert.ilo.openstreetmap.org:10.0.0.62 -# Gazetteer server +# Gazetteer (nominatim) server -+gazetteer.openstreetmap.org:128.40.58.201 -+gazetteer.internal.openstreetmap.org:10.0.0.1 ++katie.openstreetmap.org:128.40.168.101 ++katie.internal.openstreetmap.org:10.0.0.6 ++nominatim.openstreetmap.org:128.40.168.101 -# Mapnik tile server, with wildcard alias to allow parallel loading +# Gazetteer (namefinder) server -+tile.openstreetmap.org:128.40.58.204 -+a.tile.openstreetmap.org:128.40.58.204 -+b.tile.openstreetmap.org:128.40.58.204 -+c.tile.openstreetmap.org:128.40.58.204 -+tile.internal.openstreetmap.org:10.0.0.7 ++gazetteer.openstreetmap.org:128.40.168.96 ++gazetteer.internal.openstreetmap.org:10.0.0.1 -# Osmarender tile server, with wildcard alias to allow parallel loading +# XAPI server -+tah.openstreetmap.org:137.110.119.130 -+*.tah.openstreetmap.org:137.110.119.130 ++fafnir.openstreetmap.org:128.40.168.97 ++xapi.openstreetmap.org:128.40.168.97 ++fafnir.internal.openstreetmap.org:10.0.0.4 -# Database server +# Mapnik tile server, with wildcard alias to allow parallel loading -+db.internal.openstreetmap.org:10.0.0.6 ++yevaud.openstreetmap.org:128.40.168.104 ++tile.openstreetmap.org:128.40.168.104 ++a.tile.openstreetmap.org:128.40.168.104 ++b.tile.openstreetmap.org:128.40.168.104 ++c.tile.openstreetmap.org:128.40.168.104 ++yevaud.internal.openstreetmap.org:10.0.0.15 ++yevaud.ilo.openstreetmap.org:10.0.0.65 -# Backups are currently on tile +# Services machine ++horntail.openstreetmap.org:128.40.168.99 ++munin.openstreetmap.org:128.40.168.99 +backup.openstreetmap.org:10.0.0.7 ++horntail.internal.openstreetmap.org:10.0.0.7 ++horntail.ilo.openstreetmap.org:10.1.0.7 -# Development server with wildcard alias for user sites +# Osmarender tile server, with wildcard alias to allow parallel loading -+dev.openstreetmap.org:128.40.58.205 -+*.dev.openstreetmap.org:128.40.58.205 -+dev.internal.openstreetmap.org:10.0.0.5 ++tah.openstreetmap.org:129.132.168.206 ++a.tah.openstreetmap.org:129.132.168.206 ++b.tah.openstreetmap.org:129.132.168.206 ++c.tah.openstreetmap.org:129.132.168.206 ++d.tah.openstreetmap.org:129.132.168.206 ++e.tah.openstreetmap.org:129.132.168.206 ++f.tah.openstreetmap.org:129.132.168.206 ++server.tah.openstreetmap.org:129.132.168.206 -# Planet dumps are currently served from dev +# Database server -+planet.openstreetmap.org:128.40.58.205 ++smaug.internal.openstreetmap.org:10.0.0.13 ++db.internal.openstreetmap.org:10.0.0.13:60 ++smaug.ilo.internal.openstreetmap.org:10.0.0.63 -# Munin currently operates from gazetteer +# Development server with wildcard alias for user sites -+munin.openstreetmap.org:128.40.58.201 ++old-dev.openstreetmap.org:128.40.168.100 ++*.old-dev.openstreetmap.org:128.40.168.100 ++old-dev.internal.openstreetmap.org:10.0.0.5 + ++errol.openstreetmap.org:128.40.168.103 ++dev.openstreetmap.org:128.40.168.103 ++*.dev.openstreetmap.org:128.40.168.103 ++ooc.openstreetmap.org:128.40.168.103 ++a.ooc.openstreetmap.org:128.40.168.103 ++b.ooc.openstreetmap.org:128.40.168.103 ++c.ooc.openstreetmap.org:128.40.168.103 ++npe.openstreetmap.org:128.40.168.103 ++os.openstreetmap.org:128.40.168.103 ++a.os.openstreetmap.org:128.40.168.103 ++b.os.openstreetmap.org:128.40.168.103 ++c.os.openstreetmap.org:128.40.168.103 ++errol.ilo.openstreetmap.org:10.0.0.64 + +# Foundation server + ++ridley.openstreetmap.org:128.40.168.102 ++otrs.openstreetmap.org:128.40.168.102 ++blog.openstreetmap.org:128.40.168.102 ++foundation.openstreetmap.org:128.40.168.102 ++ridley.internal.openstreetmap.org:10.0.0.3 + +# Planet dumps are currently served from horntail + ++planet.openstreetmap.org:128.40.168.99 # Spare servers ++fuchur.openstreetmap.org:128.40.168.105 +fuchur.internal.openstreetmap.org:10.0.0.9 +fuchur.ilo.openstreetmap.org:10.0.0.59 +dulcy.internal.openstreetmap.org:10.0.0.2 -+ridley.internal.openstreetmap.org:10.0.0.3 -+fafnir.internal.openstreetmap.org:10.0.0.4 -+fafnir.openstreetmap.org:128.40.58.202 + +# APC power switch + ++apc1.internal.openstreetmap.org:10.0.0.49 # Forum server -+forum.openstreetmap.org:87.239.8.25 ++forum.openstreetmap.org:93.186.179.231 # Bytemark virtual machine, and the services which operate from it @@ -105,19 +153,35 @@ +mail.openstreetmap.org:89.16.177.88 +lists.openstreetmap.org:89.16.177.88 +svn.openstreetmap.org:89.16.177.88 ++git.openstreetmap.org:89.16.177.88 +trac.openstreetmap.org:89.16.177.88 -#+wiki.openstreetmap.org:89.16.177.88 -+foundation.openstreetmap.org:89.16.177.88 +irc.openstreetmap.org:89.16.177.88 ++idris.internal.openstreetmap.org:10.0.0.253 -# Wiki is currently fronted by Grant's proxy (short timeout to allow changes) +# Wiki server -+wiki.openstreetmap.org:89.145.68.232:3600 ++konqi.openstreetmap.org:193.63.75.26 ++konqi.ilo.openstreetmap.org:193.63.75.27 ++konqi.internal.openstreetmap.org:10.0.0.252 ++wiki.openstreetmap.org:193.63.75.26 ++dump.wiki.openstreetmap.org:193.63.75.26 # Blog aggregator (on Shaun McDonald's VM) +blogs.openstreetmap.org:89.16.175.12 +# Cruise (on Shaun McDonald's VM) + ++cruise.openstreetmap.org:89.16.175.12 + +# Donation site + ++donate.openstreetmap.org:89.145.67.86 + # Our shop Cshop.openstreetmap.org:virtual.fotopic.net + +# HOT site + ++hot.openstreetmap.org:69.163.129.108