X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/c6948b48e6869569afd677b23ad370463c669ee5..67295f0cf846d4183dc16db1f1d7d360f4c1fafc:/src/openstreetmap diff --git a/src/openstreetmap b/src/openstreetmap index f0c469f..dd6262a 100644 --- a/src/openstreetmap +++ b/src/openstreetmap @@ -12,6 +12,7 @@ @openstreetmap:89.16.179.150:a:10 @openstreetmap::backup.mx.bytemark.co.uk:20 +@noreply.openstreetmap::a.mx.openstreetmap:10 @otrs.openstreetmap::a.mx.openstreetmap:10 @messages.openstreetmap::a.mx.openstreetmap:10 @@ -23,96 +24,103 @@ # Delegate geo.openstreetmap.org to PowerDNS -&geo.openstreetmap:89.16.179.150:a.ns.openstreetmap:86400 +&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 -+soup.openstreetmap:193.63.75.99 ++spike-01.openstreetmap:193.63.75.99 +3spike-01.openstreetmap:2001063000120500021a4bfffea5fd2a +openstreetmap:193.63.75.99:600 +3openstreetmap:2001063000120500021a4bfffea5fd2a:600 +www.openstreetmap:193.63.75.99:600 +3www.openstreetmap:2001063000120500021a4bfffea5fd2a:600 +api.openstreetmap:193.63.75.99:600 +3api.openstreetmap:2001063000120500021a4bfffea5fd2a:600 +maps.openstreetmap:193.63.75.99:600 +3maps.openstreetmap:2001063000120500021a4bfffea5fd2a:600 +mapz.openstreetmap:193.63.75.99:600 -+soup.ic.openstreetmap:146.179.159.162 -+soup.oob.openstreetmap:146.179.159.188 +3mapz.openstreetmap:2001063000120500021a4bfffea5fd2a:600 ++spike-01.ic.openstreetmap:146.179.159.162 ++www.ic.openstreetmap:146.179.159.162:3600 ++spike-01.oob.openstreetmap:146.179.159.188 -+fiddlestick.openstreetmap:193.63.75.100 ++spike-02.openstreetmap:193.63.75.100 +3spike-02.openstreetmap:20010630001205000219bbfffe393d9e +openstreetmap:193.63.75.100:600 +3openstreetmap:20010630001205000219bbfffe393d9e:600 +www.openstreetmap:193.63.75.100:600 +3www.openstreetmap:20010630001205000219bbfffe393d9e:600 +api.openstreetmap:193.63.75.100:600 +3api.openstreetmap:20010630001205000219bbfffe393d9e:600 +maps.openstreetmap:193.63.75.100:600 +3maps.openstreetmap:20010630001205000219bbfffe393d9e:600 +mapz.openstreetmap:193.63.75.100:600 -+fiddlestick.ic.openstreetmap:146.179.159.163 -+fiddlestick.oob.openstreetmap:146.179.159.187 - -+bowser.openstreetmap:193.63.75.103 -+openstreetmap:193.63.75.103:600 -+www.openstreetmap:193.63.75.103:600 -+api.openstreetmap:193.63.75.103:600 -+maps.openstreetmap:193.63.75.103:600 -+mapz.openstreetmap:193.63.75.103:600 -+bowser.ic.openstreetmap:146.179.159.171 -+bowser.oob.openstreetmap:146.179.159.180 +3mapz.openstreetmap:20010630001205000219bbfffe393d9e:600 ++spike-02.ic.openstreetmap:146.179.159.163 ++www.ic.openstreetmap:146.179.159.163:3600 ++spike-02.oob.openstreetmap:146.179.159.180 + ++spike-03.openstreetmap:193.63.75.103 +3spike-03.openstreetmap:20010630001205000219bbfffe398aba +#+openstreetmap:193.63.75.103:600 +#3openstreetmap:20010630001205000219bbfffe398aba:600 +#+www.openstreetmap:193.63.75.103:600 +#3www.openstreetmap:20010630001205000219bbfffe398aba:600 +#+api.openstreetmap:193.63.75.103:600 +#3api.openstreetmap:20010630001205000219bbfffe398aba:600 +#+maps.openstreetmap:193.63.75.103:600 +#3maps.openstreetmap:20010630001205000219bbfffe398aba:600 +#+mapz.openstreetmap:193.63.75.103:600 +#3mapz.openstreetmap:20010630001205000219bbfffe398aba:600 ++spike-03.ic.openstreetmap:146.179.159.171 ++www.ic.openstreetmap:146.179.159.171:3600 ++spike-03.oob.openstreetmap:146.179.159.187 # Rails application servers -+draco.ic.openstreetmap:146.179.159.165 ++thorn-01.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 ++thorn-01.oob.openstreetmap:146.179.159.185 + ++thorn-02.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 ++thorn-02.oob.openstreetmap:146.179.159.184 + ++thorn-03.ic.openstreetmap:146.179.159.167 +rails3.ic.openstreetmap:146.179.159.167 -+norbert.oob.openstreetmap:146.179.159.183 ++thorn-03.oob.openstreetmap:146.179.159.183 -# Gazetteer (nominatim) server +# Nominatim server +poldi.openstreetmap:128.40.168.106 -+nominatim.openstreetmap:128.40.168.106:600 ++nominatim.openstreetmap:128.40.168.106:3600 +poldi.ucl.openstreetmap:10.0.0.16 +poldi.oob.openstreetmap:10.0.1.16 -# Gazetteer (namefinder) server - -+gazetteer.openstreetmap:128.40.168.96 -+gazetteer.ucl.openstreetmap:10.0.0.1 - -# XAPI server - -+fafnir.openstreetmap:128.40.168.97 -+xapi.openstreetmap:128.40.168.97 -+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 ++norbert.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 ++norbert.ilo.openstreetmap:10.0.0.55 ++norbert.ucl.openstreetmap:10.0.0.5 ++norbert.oob.openstreetmap:10.0.1.5 # OWL server +zark.openstreetmap:128.40.168.107 -+owl.openstreetmap:128.40.168107 ++owl.openstreetmap:128.40.168.107 +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 -Ctile.openstreetmap:tile.geo.openstreetmap:600 -Ca.tile.openstreetmap:tile.geo.openstreetmap:600 -Cb.tile.openstreetmap:tile.geo.openstreetmap:600 -Cc.tile.openstreetmap:tile.geo.openstreetmap:600 +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 @@ -120,40 +128,40 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap:600 # Map geographic zones to tile servers +london.tile.openstreetmap:193.63.75.98:3600 -+sjobo.tile.openstreetmap:85.30.159.149:3600 -3sjobo.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 ++moscow.tile.openstreetmap:130.193.62.73:3600 ++brisbane.tile.openstreetmap:203.26.72.12:3600 +# remove IPv6 until we have IPv6 capable squid +# 3brisbane.tile.openstreetmap:2402640000010006021708fffe5640c3:3600 ++pau.tile.openstreetmap:193.55.222.229:3600 ++amsterdam.tile.openstreetmap:134.90.146.26:3600 ++oslo.tile.openstreetmap:31.169.50.10:3600 # Services machine +horntail.openstreetmap:193.63.75.101 +3horntail.openstreetmap:20010630001205000202b3fffeeceeac +planet.openstreetmap:193.63.75.101 -+munin.openstreetmap:193.63.75.101 -+apt.openstreetmap:193.63.75.101 +3planet.openstreetmap:20010630001205000202b3fffeeceeac +stats.openstreetmap:193.63.75.101 +3stats.openstreetmap:20010630001205000202b3fffeeceeac +chef.openstreetmap:193.63.75.101 +3chef.openstreetmap:20010630001205000202b3fffeeceeac +backup.openstreetmap:193.63.75.101 +3backup.openstreetmap:20010630001205000202b3fffeeceeac +horntail.ic.openstreetmap:146.179.159.164 +backup.ic.openstreetmap:146.179.159.164 +horntail.oob.openstreetmap:146.179.159.186 -# 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 - # Database server +smaug.ic.openstreetmap:146.179.159.168 -+db.ic.openstreetmap:146.179.159.168 +smaug.oob.openstreetmap:146.179.159.182 +ramoth.ic.openstreetmap:146.179.159.170 ++db.ic.openstreetmap:146.179.159.170:600 +ramoth.oob.openstreetmap:146.179.159.181 # Development server with wildcard alias for user sites @@ -166,10 +174,6 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap:600 +b.ooc.openstreetmap:128.40.168.103 +c.ooc.openstreetmap:128.40.168.103 +npe.openstreetmap:128.40.168.103 -+os.openstreetmap:128.40.168.103 -+a.os.openstreetmap:128.40.168.103 -+b.os.openstreetmap:128.40.168.103 -+c.os.openstreetmap:128.40.168.103 +errol.ucl.openstreetmap:10.0.0.14 +errol.oob.openstreetmap:10.0.1.14 @@ -180,8 +184,8 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap:600 +thinkup.openstreetmap:128.40.168.102 +blog.openstreetmap:128.40.168.102 +foundation.openstreetmap:128.40.168.102 -+tickets.openstreetmap:128.40.168.102 +ridley.ucl.openstreetmap:10.0.0.3 ++ridley.oob.openstreetmap:10.0.1.3 # Piwik server @@ -190,15 +194,44 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap:600 +eustace.ucl.openstreetmap:10.0.0.9 +eustace.oob.openstreetmap:10.0.1.9 -# Spare machines +# Imagery servers -+urmel.ucl.openstreetmap:10.0.0.6 -+urmel.oob.openstreetmap:10.0.1.6 ++faffy.openstreetmap:128.40.168.108 ++agri.openstreetmap:128.40.168.108:3600 ++a.agri.openstreetmap:128.40.168.108:3600 ++b.agri.openstreetmap:128.40.168.108:3600 ++c.agri.openstreetmap:128.40.168.108:3600 ++os.openstreetmap:128.40.168.108:3600 ++a.os.openstreetmap:128.40.168.108:3600 ++b.os.openstreetmap:128.40.168.108:3600 ++c.os.openstreetmap:128.40.168.108:3600 +faffy.ucl.openstreetmap:10.0.0.7 +faffy.oob.openstreetmap:10.0.1.7 -+faffy.openstreetmap:128.40.168.108 + ++draco.openstreetmap:128.40.168.95 ++draco.ucl.openstreetmap:10.0.0.11 ++draco.oob.openstreetmap:10.0.1.11 + +# Munin server + ++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 + +# Gosmore routing server + ++sarel.openstreetmap:128.40.168.97 ++sarel.ucl.openstreetmap:10.0.0.12 ++sarel.oob.openstreetmap:10.0.1.12 + +# Spare machines + +puff.ucl.openstreetmap:10.0.0.10 +puff.oob.openstreetmap:10.0.1.10 ++idris.openstreetmap:128.40.168.98 ++idris.ucl.openstreetmap:10.0.0.4 ++idris.oob.openstreetmap:10.0.1.4 # APC power switches @@ -227,7 +260,7 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap:600 +help.openstreetmap:89.16.179.150 +shop.openstreetmap:89.16.179.150 +dns.openstreetmap:89.16.179.150 -+shenron.bm.openstreetmap:10.0.0.251 ++shenron.bm.openstreetmap:10.0.16.3 3shenron.openstreetmap:200141c800100996021d7dfffec3df70 3mail.openstreetmap:200141c800100996021d7dfffec3df70 @@ -241,33 +274,48 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap:600 # Wiki server -+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.openstreetmap:193.63.75.104 +3konqi.openstreetmap:2001063000120500021560fffeaa9956 ++konqi.ilo.openstreetmap:146.179.159.179 ++wiki.openstreetmap:193.63.75.104:600 ++dump.wiki.openstreetmap:193.63.75.104:600 #+konqi.ic.openstreetmap:10.0.16.1 #+konqi.oob.openstreetmap:10.0.17.1 # Tile cache servers +orm.openstreetmap:193.63.75.98 +3orm.openstreetmap:200106300012050002e081fffec52a8c #+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 ++gorynych.openstreetmap:130.193.62.73 ++bunyip.openstreetmap:203.26.72.12 +3bunyip.openstreetmap:2402640000010006021708fffe5640c3 ++lurien.openstreetmap:193.55.222.229 ++trogdor.openstreetmap:134.90.146.26 ++trogdor.oob.openstreetmap:134.90.146.30 ++ridgeback.openstreetmap:31.169.50.10 ++ridgeback.oob.openstreetmap:31.169.50.14 # Blog aggregator (on Shaun McDonald's VM) +blogs.openstreetmap:89.16.175.12 -# Cruise (on Shaun McDonald's VM) +# Continuous integration server (on Shaun McDonald's machine) -+cruise.openstreetmap:89.16.175.12 ++ci.openstreetmap:5.9.72.139 ++cruise.openstreetmap:5.9.72.139 # Donation site -+donate.openstreetmap:89.145.67.86 ++donate.openstreetmap:89.145.67.86:600 + +# DMCA Notice site + ++dmca.openstreetmap:89.145.67.86:600 # HOT site @@ -278,5 +326,5 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap:600 # Jochen Topf's taginfo service, running on openstreetmap.de hardware -+taginfo.openstreetmap:85.214.118.227 -3taginfo.openstreetmap:2a0102384000000003cac7808a7d7be2 ++taginfo.openstreetmap:85.214.112.59 +3taginfo.openstreetmap:2a01023840000000002168799ac19e7e