X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/16981b75922de42623c67b8904b9cda923c2c944..32b1e2090b1de2a0f7c2fa1eb6655a3b75cd2db7:/openstreetmap.org diff --git a/openstreetmap.org b/openstreetmap.org index 77d90f4..64561a0 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,25 +42,40 @@ +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 -+npe.openstreetmap.org:128.40.58.201 ++katie.openstreetmap.org:128.40.168.101 ++katie.internal.openstreetmap.org:10.0.0.6 ++nominatim.openstreetmap.org:128.40.168.101 + +# Gazetteer (namefinder) server + ++gazetteer.openstreetmap.org:128.40.168.96 +gazetteer.internal.openstreetmap.org:10.0.0.1 # XAPI server -+fafnir.openstreetmap.org:128.40.58.202 -+xapi.openstreetmap.org:128.40.58.202 ++fafnir.openstreetmap.org:128.40.168.97 ++xapi.openstreetmap.org:128.40.168.97 +fafnir.internal.openstreetmap.org:10.0.0.4 # Mapnik tile server, with wildcard alias to allow parallel loading -+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 ++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 + +# 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 # Osmarender tile server, with wildcard alias to allow parallel loading @@ -77,38 +94,54 @@ +db.internal.openstreetmap.org:10.0.0.13:60 +smaug.ilo.internal.openstreetmap.org:10.0.0.63 -# Backups are currently on tile - -+backup.openstreetmap.org:10.0.0.7 - # Development server with wildcard alias for user sites -+dev.openstreetmap.org:128.40.58.205 -+*.dev.openstreetmap.org:128.40.58.205 ++old-dev.openstreetmap.org:128.40.168.100 ++*.old-dev.openstreetmap.org:128.40.168.100 +dev.internal.openstreetmap.org:10.0.0.5 -# Planet dumps are currently served from dev - -+planet.openstreetmap.org:128.40.58.205 ++errol.openstreetmap.org:128.40.168.103 ++dev.openstreetmap.org:128.40.168.103 ++*.dev.openstreetmap.org:128.40.168.103 ++new-dev.openstreetmap.org:128.40.168.103 ++*.new-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 -# Munin currently operates from gazetteer +# Planet dumps are currently served from horntail -+munin.openstreetmap.org:128.40.58.201 ++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 -+katie.internal.openstreetmap.org:10.0.0.6 # APC power switch -apc1.internal.openstreetmap.org:10.0.0.49 + ++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 @@ -122,10 +155,18 @@ apc1.internal.openstreetmap.org:10.0.0.49 +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 server + ++konqi.openstreetmap.org:193.63.75.26 ++konqi.ilo.openstreetmap.org:193.63.75.27 ++konqi.internal.openstreetmap.org:10.0.0.252 ++dump.wiki.openstreetmap.org:193.63.75.26 # Wiki is currently fronted by Grant's proxy (short timeout to allow changes) @@ -135,6 +176,18 @@ apc1.internal.openstreetmap.org:10.0.0.49 +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