X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/2c6ede3aa0c9acefab0ca350e2139823a83fecc4..5d59f30b4b58ca17bd2f2f4eef31e5dd3cbd2a91:/data/openstreetmap.org diff --git a/data/openstreetmap.org b/data/openstreetmap.org index e7559e6..1fcad93 100644 --- a/data/openstreetmap.org +++ b/data/openstreetmap.org @@ -10,26 +10,37 @@ # Make the virtual machine the primary MX with Bytemark as backup -@openstreetmap.org:89.16.177.88:a:10 +@openstreetmap.org:89.16.179.150: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 +@otrs.openstreetmap.org::a.mx.openstreetmap.org:10 +@messages.openstreetmap.org::a.mx.openstreetmap.org:10 -# Publish an SPF record indicating that only idris sends mail +3a.mx.openstreetmap.org:200141c800100996021d7dfffec3df70 -'openstreetmap.org:v=spf1 ip4\07289.16.177.88 ~all +# Publish an SPF record indicating that only shenron sends mail -# Main web server and it's aliases +'openstreetmap.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.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 ++openstreetmap.org:128.40.168.98:3600 ++www.openstreetmap.org:128.40.168.98:3600 ++api.openstreetmap.org:128.40.168.98:3600 ++maps.openstreetmap.org:128.40.168.98:3600 ++mapz.openstreetmap.org:128.40.168.98:3600 +puff.internal.openstreetmap.org:10.0.0.8 +puff.ilo.openstreetmap.org:10.0.0.58 ++fuchur.openstreetmap.org:128.40.168.105 ++openstreetmap.org:128.40.168.105:3600 ++www.openstreetmap.org:128.40.168.105:3600 ++api.openstreetmap.org:128.40.168.105:3600 ++maps.openstreetmap.org:128.40.168.105:3600 ++mapz.openstreetmap.org:128.40.168.105:3600 ++fuchur.internal.openstreetmap.org:10.0.0.9 ++fuchur.ilo.openstreetmap.org:10.0.0.59 + # Rails application servers +draco.internal.openstreetmap.org:10.0.0.10 @@ -44,9 +55,10 @@ # Gazetteer (nominatim) server -+katie.openstreetmap.org:128.40.168.101 -+katie.internal.openstreetmap.org:10.0.0.6 -+nominatim.openstreetmap.org:128.40.168.101 ++poldi.openstreetmap.org:128.40.168.106 ++poldi.internal.openstreetmap.org:10.0.0.16 ++poldi.ilo.openstreetmap.org:10.0.0.66 ++nominatim.openstreetmap.org:128.40.168.106 # Gazetteer (namefinder) server @@ -59,13 +71,27 @@ +xapi.openstreetmap.org:128.40.168.97 +fafnir.internal.openstreetmap.org:10.0.0.4 +# OWL server + ++albi.openstreetmap.org:128.40.168.95 ++owl.openstreetmap.org:128.40.168.95 ++albi.internal.openstreetmap.org:10.0.0.2 ++albi.ilo.openstreetmap.org:10.0.0.52 + +# Spare server + ++azure.openstreetmap.org:128.40.168.100 ++jxapi.openstreetmap.org:128.40.168.100 ++azure.internal.openstreetmap.org:10.0.0.5 ++azure.ilo.openstreetmap.org:10.0.0.55 + # Mapnik tile server, with wildcard alias to allow parallel loading +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 ++tile.openstreetmap.org:128.40.168.104:3600 ++a.tile.openstreetmap.org:128.40.168.104:3600 ++b.tile.openstreetmap.org:128.40.168.104:3600 ++c.tile.openstreetmap.org:128.40.168.104:3600 +yevaud.internal.openstreetmap.org:10.0.0.15 +yevaud.ilo.openstreetmap.org:10.0.0.65 @@ -96,10 +122,6 @@ # Development server with wildcard alias for user sites -+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 @@ -126,38 +148,38 @@ +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 - # APC power switch +apc1.internal.openstreetmap.org:10.0.0.49 ++apc2.internal.openstreetmap.org:10.0.0.50 ++apc3.internal.openstreetmap.org:10.0.0.51 # Forum server +forum.openstreetmap.org:93.186.179.231 -# Bytemark virtual machine, and the services which operate from it - -+vm.openstreetmap.org:80.68.94.95 -+stats.wiki.openstreetmap.org:80.68.94.95 -+vm.internal.openstreetmap.org:10.0.0.253 - -# Bytemark atom machine, and the services which operate from it - -+idris.openstreetmap.org:89.16.177.88 -+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 -+irc.openstreetmap.org:89.16.177.88 -+help.openstreetmap.org:89.16.177.88 -+idris.internal.openstreetmap.org:10.0.0.253 +# Bytemark machine, and the services which operate from it + ++shenron.openstreetmap.org:89.16.179.150 ++mail.openstreetmap.org:89.16.179.150 ++lists.openstreetmap.org:89.16.179.150 ++svn.openstreetmap.org:89.16.179.150 ++git.openstreetmap.org:89.16.179.150 ++trac.openstreetmap.org:89.16.179.150 ++irc.openstreetmap.org:89.16.179.150 ++help.openstreetmap.org:89.16.179.150 ++shop.openstreetmap.org:89.16.179.150 ++shenron.internal.openstreetmap.org:10.0.0.251 + +3shenron.openstreetmap.org:200141c800100996021d7dfffec3df70 +3mail.openstreetmap.org:200141c800100996021d7dfffec3df70 +3lists.openstreetmap.org:200141c800100996021d7dfffec3df70 +3svn.openstreetmap.org:200141c800100996021d7dfffec3df70 +3git.openstreetmap.org:200141c800100996021d7dfffec3df70 +3trac.openstreetmap.org:200141c800100996021d7dfffec3df70 +3irc.openstreetmap.org:200141c800100996021d7dfffec3df70 +3help.openstreetmap.org:200141c800100996021d7dfffec3df70 +3shop.openstreetmap.org:200141c800100996021d7dfffec3df70 # Wiki server @@ -167,6 +189,10 @@ +wiki.openstreetmap.org:193.63.75.26 +dump.wiki.openstreetmap.org:193.63.75.26 +# Tile cache server + ++orm.openstreetmap.org:193.63.75.98 + # Blog aggregator (on Shaun McDonald's VM) +blogs.openstreetmap.org:89.16.175.12 @@ -179,10 +205,6 @@ +donate.openstreetmap.org:89.145.67.86 -# Our shop - -Cshop.openstreetmap.org:virtual.fotopic.net - # HOT site +hot.openstreetmap.org:69.163.129.108