X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/f665113ea210cca604ae50da1281b6dee1fd54f9..438cd61d8c34e3a634b51a72a61f4beef2614aa9:/src/openstreetmap diff --git a/src/openstreetmap b/src/openstreetmap index 8d4a1c0..ec911a9 100644 --- a/src/openstreetmap +++ b/src/openstreetmap @@ -10,104 +10,142 @@ # Make the virtual machine the primary MX with Bytemark as backup -@openstreetmap:89.16.177.88:a:10 +@openstreetmap:89.16.179.150:a:10 @openstreetmap::backup.mx.bytemark.co.uk:20 -@otrs.openstreetmap:89.16.177.88:a:10 -@messages.openstreetmap:89.16.177.88:a:10 +@otrs.openstreetmap::a.mx.openstreetmap:10 +@messages.openstreetmap::a.mx.openstreetmap:10 -# Publish an SPF record indicating that only idris sends mail +3a.mx.openstreetmap:200141c800100996021d7dfffec3df70 -'openstreetmap:v=spf1 ip4\07289.16.177.88 ~all +# Publish an SPF record indicating that only shenron sends mail -# Main web servers and their aliases +'openstreetmap:v=spf1 ip4\07289.16.179.150 ip6\0722001\07241c8\07210\072996\07221d\0727dff\072fec3\072df70 ~all -+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 +# Delegate geo.openstreetmap.org to PowerDNS -# Rails application servers +&geo.openstreetmap:89.16.179.150:a.ns.openstreetmap:3600 +&geo.openstreetmap:193.63.75.98:b.ns.openstreetmap:3600 +&geo.openstreetmap:85.30.190.241:c.ns.openstreetmap:3600 + +# Main web servers and their aliases -+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 ++spike-01.openstreetmap:193.63.75.99 ++openstreetmap:193.63.75.99:60 ++www.openstreetmap:193.63.75.99:60 ++api.openstreetmap:193.63.75.99:60 ++maps.openstreetmap:193.63.75.99:60 ++mapz.openstreetmap:193.63.75.99:60 ++spike-01.ic.openstreetmap:146.179.159.162 ++spike-01.oob.openstreetmap:146.179.159.188 + ++spike-02.openstreetmap:193.63.75.100 ++openstreetmap:193.63.75.100:60 ++www.openstreetmap:193.63.75.100:60 ++api.openstreetmap:193.63.75.100:60 ++maps.openstreetmap:193.63.75.100:60 ++mapz.openstreetmap:193.63.75.100:60 ++spike-02.ic.openstreetmap:146.179.159.163 ++spike-02.oob.openstreetmap:146.179.159.187 + ++spike-03.openstreetmap:193.63.75.103 +#+openstreetmap:193.63.75.103:60 +#+www.openstreetmap:193.63.75.103:60 +#+api.openstreetmap:193.63.75.103:60 +#+maps.openstreetmap:193.63.75.103:60 +#+mapz.openstreetmap:193.63.75.103:60 ++spike-03.ic.openstreetmap:146.179.159.171 ++spike-03.oob.openstreetmap:146.179.159.180 -# Gazetteer (nominatim) server +# Rails application servers -+katie.openstreetmap:128.40.168.101 -+katie.internal.openstreetmap:10.0.0.6 -+nominatim.openstreetmap:128.40.168.101 ++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 (namefinder) server +# Nominatim server -+gazetteer.openstreetmap:128.40.168.96 -+gazetteer.internal.openstreetmap:10.0.0.1 ++poldi.openstreetmap:128.40.168.106 ++nominatim.openstreetmap:128.40.168.106:600 ++poldi.ucl.openstreetmap:10.0.0.16 ++poldi.oob.openstreetmap:10.0.1.16 # 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 + +# Tile cache server + ++albi.openstreetmap:128.40.168.95 ++albi.ilo.openstreetmap:10.0.0.52 ++albi.ucl.openstreetmap:10.0.0.2 ++albi.oob.openstreetmap:10.0.1.2 + +# JXAPI server + ++azure.openstreetmap:128.40.168.100 ++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 + +# OWL server + ++zark.openstreetmap:128.40.168.107 ++owl.openstreetmap:128.40.168107 ++zark.ucl.openstreetmap:10.0.0.8 ++zark.oob.openstreetmap:10.0.1.8 # 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 +Ctile.openstreetmap:tile.geo.openstreetmap.org:600 +Ca.tile.openstreetmap:tile.geo.openstreetmap.org:600 +Cb.tile.openstreetmap:tile.geo.openstreetmap.org:600 +Cc.tile.openstreetmap:tile.geo.openstreetmap.org:600 ++parent.tile.openstreetmap:128.40.168.104:300 ++yevaud.ucl.openstreetmap:10.0.0.15 ++yevaud.oob.openstreetmap:10.0.1.15 + +# Map geographic zones to tile servers + ++london.tile.openstreetmap:193.63.75.98:3600 ++sjobo2.tile.openstreetmap:85.30.159.149:3600 +# remove IPv6 until we have IPv6 capable squid +# 3sjobo2.tile.openstreetmap:2a02008000003ff8020f20fffef66c09:3600 ++sjobo.tile.openstreetmap:85.30.190.241:3600 +# remove IPv6 until we have IPv6 capable squid +# 3sjobo.tile.openstreetmap:2a02008000003ff8022264fffe2a2714:3600 # 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 - -# Osmarender tile server, with wildcard alias to allow parallel loading - -+tah.openstreetmap:129.132.168.206 -+a.tah.openstreetmap:129.132.168.206 -+b.tah.openstreetmap:129.132.168.206 -+c.tah.openstreetmap:129.132.168.206 -+d.tah.openstreetmap:129.132.168.206 -+e.tah.openstreetmap:129.132.168.206 -+f.tah.openstreetmap:129.132.168.206 -+server.tah.openstreetmap:129.132.168.206 ++horntail.openstreetmap:193.63.75.101 ++planet.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 # 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 ++smaug.oob.openstreetmap:146.179.159.182 -# Development server with wildcard alias for user sites ++ramoth.ic.openstreetmap:146.179.159.170 ++db.ic.openstreetmap:146.179.159.170:600 ++ramoth.oob.openstreetmap:146.179.159.181 -+old-dev.openstreetmap:128.40.168.100 -+*.old-dev.openstreetmap:128.40.168.100 -+old-dev.internal.openstreetmap:10.0.0.5 +# Development server with wildcard alias for user sites +errol.openstreetmap:128.40.168.103 +dev.openstreetmap:128.40.168.103 @@ -121,57 +159,108 @@ +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 +ridley.openstreetmap:128.40.168.102 +otrs.openstreetmap:128.40.168.102 ++thinkup.openstreetmap:128.40.168.102 +blog.openstreetmap:128.40.168.102 +foundation.openstreetmap:128.40.168.102 -+ridley.internal.openstreetmap:10.0.0.3 ++tickets.openstreetmap:128.40.168.102 ++ridley.ucl.openstreetmap:10.0.0.3 ++ridley.oob.openstreetmap:10.0.1.3 -# Planet dumps are currently served from horntail +# Piwik server -+planet.openstreetmap:128.40.168.99 ++eustace.openstreetmap:128.40.168.101 ++piwik.openstreetmap:128.40.168.101 ++eustace.ucl.openstreetmap:10.0.0.9 ++eustace.oob.openstreetmap:10.0.1.9 -# Spare servers +# Imagery server -+dulcy.internal.openstreetmap:10.0.0.2 ++faffy.openstreetmap:128.40.168.108 ++agri.openstreetmap:128.40.168.108 ++a.agri.openstreetmap:128.40.168.108 ++b.agri.openstreetmap:128.40.168.108 ++c.agri.openstreetmap:128.40.168.108 ++faffy.ucl.openstreetmap:10.0.0.7 ++faffy.oob.openstreetmap:10.0.1.7 -# APC power switch +# Munin server -+apc1.internal.openstreetmap:10.0.0.49 ++urmel.openstreetmap:128.40.168.96 ++munin.openstreetmap:128.40.168.96:600 ++urmel.ucl.openstreetmap:10.0.0.6 ++urmel.oob.openstreetmap:10.0.1.6 -# Forum server +# Spare machines -+forum.openstreetmap:93.186.179.231 ++puff.ucl.openstreetmap:10.0.0.10 ++puff.oob.openstreetmap:10.0.1.10 + +# APC power switches -# Bytemark virtual machine, and the services which operate from it ++apc1.ucl.openstreetmap:10.0.0.49 ++apc2.ucl.openstreetmap:10.0.0.50 ++apc3.ucl.openstreetmap:10.0.0.51 -+vm.openstreetmap:80.68.94.95 -+stats.wiki.openstreetmap:80.68.94.95 -+vm.internal.openstreetmap:10.0.0.253 +# Managed network switches -# Bytemark atom machine, and the services which operate from it ++switch1.openstreetmap:193.63.75.102 ++switch2.ic.openstreetmap:146.179.159.169 -+idris.openstreetmap:89.16.177.88 -+mail.openstreetmap:89.16.177.88 -+lists.openstreetmap:89.16.177.88 -+svn.openstreetmap:89.16.177.88 -+git.openstreetmap:89.16.177.88 -+trac.openstreetmap:89.16.177.88 -+irc.openstreetmap:89.16.177.88 -+help.openstreetmap:89.16.177.88 -+idris.internal.openstreetmap:10.0.0.253 +# Forum server + ++forum.openstreetmap:93.186.179.231 + +# Bytemark machine, and the services which operate from it + ++shenron.openstreetmap:89.16.179.150 ++mail.openstreetmap:89.16.179.150 ++lists.openstreetmap:89.16.179.150 ++svn.openstreetmap:89.16.179.150 ++git.openstreetmap:89.16.179.150 ++trac.openstreetmap:89.16.179.150 ++irc.openstreetmap:89.16.179.150 ++help.openstreetmap:89.16.179.150 ++shop.openstreetmap:89.16.179.150 ++dns.openstreetmap:89.16.179.150 ++shenron.bm.openstreetmap:10.0.16.3 + +3shenron.openstreetmap:200141c800100996021d7dfffec3df70 +3mail.openstreetmap:200141c800100996021d7dfffec3df70 +3lists.openstreetmap:200141c800100996021d7dfffec3df70 +3svn.openstreetmap:200141c800100996021d7dfffec3df70 +3git.openstreetmap:200141c800100996021d7dfffec3df70 +3trac.openstreetmap:200141c800100996021d7dfffec3df70 +3help.openstreetmap:200141c800100996021d7dfffec3df70 +3shop.openstreetmap:200141c800100996021d7dfffec3df70 +3dns.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 servers + ++orm.openstreetmap:193.63.75.98 +#+orm.ic.openstreetmap:10.0.16.2 +#+orm.oob.openstreetmap:10.0.17.2 ++gorwen.openstreetmap:85.30.159.149 +3gorwen.openstreetmap:2a02008000003ff8020f20fffef66c09 ++gorwen.oob.openstreetmap:85.30.129.101 ++fume.openstreetmap:85.30.190.241 +3fume.openstreetmap:2a02008000003ff8022264fffe2a2714 ++fume.oob.openstreetmap:85.30.129.98 # Blog aggregator (on Shaun McDonald's VM) @@ -185,10 +274,14 @@ +donate.openstreetmap:89.145.67.86 -# Our shop +# HOT site -Cshop.openstreetmap:virtual.fotopic.net ++hot.openstreetmap:50.56.49.247 ++humanitarian.openstreetmap:50.56.49.247 ++hot-staging.openstreetmap:50.56.49.247 ++hot-dev.openstreetmap:50.56.49.247 -# HOT site +# Jochen Topf's taginfo service, running on openstreetmap.de hardware -+hot.openstreetmap:69.163.129.108 ++taginfo.openstreetmap:85.214.118.227 +3taginfo.openstreetmap:2a0102384000000003cac7808a7d7be2