X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/a040c5b6c12a41ee12d77a564b8d46f39d46c858..a3f2922a1fb93a84f7d50bb29428a28dbb0e5e33:/src/openstreetmap diff --git a/src/openstreetmap b/src/openstreetmap index caacf01..7d4cd54 100644 --- a/src/openstreetmap +++ b/src/openstreetmap @@ -10,104 +10,159 @@ # 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 +@noreply.openstreetmap::a.mx.openstreetmap: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 + +'openstreetmap:v=spf1 ip4\07289.16.179.150 ip6\0722001\07241c8\07210\072996\07221d\0727dff\072fec3\072df70 ~all + +# Delegate geo.openstreetmap.org to PowerDNS + +&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 -+puff.openstreetmap:128.40.168.98 -+openstreetmap:128.40.168.98 -+www.openstreetmap:128.40.168.98 -+api.openstreetmap:128.40.168.98 -+maps.openstreetmap:128.40.168.98 -+mapz.openstreetmap:128.40.168.98 -+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 -+www.openstreetmap:128.40.168.105 -+api.openstreetmap:128.40.168.105 -+maps.openstreetmap:128.40.168.105 -+mapz.openstreetmap:128.40.168.105 -+fuchur.internal.openstreetmap:10.0.0.9 -+fuchur.ilo.openstreetmap:10.0.0.59 ++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 +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 + ++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 +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.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 ++thorn-01.ic.openstreetmap:146.179.159.165 ++rails1.ic.openstreetmap:146.179.159.165 ++thorn-01.oob.openstreetmap:146.179.159.185 -# Gazetteer (nominatim) server ++thorn-02.ic.openstreetmap:146.179.159.166 ++rails2.ic.openstreetmap:146.179.159.166 ++thorn-02.oob.openstreetmap:146.179.159.184 -+katie.openstreetmap:128.40.168.101 -+katie.internal.openstreetmap:10.0.0.6 -+nominatim.openstreetmap:128.40.168.101 ++thorn-03.ic.openstreetmap:146.179.159.167 ++rails3.ic.openstreetmap:146.179.159.167 ++thorn-03.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:3600 ++poldi.ucl.openstreetmap:10.0.0.16 ++poldi.oob.openstreetmap:10.0.1.16 -# XAPI server +# JXAPI server -+fafnir.openstreetmap:128.40.168.97 -+xapi.openstreetmap:128.40.168.97 -+fafnir.internal.openstreetmap:10.0.0.4 ++norbert.openstreetmap:128.40.168.100 ++jxapi.openstreetmap:128.40.168.100 ++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.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 -+tile.openstreetmap:128.40.168.104 -+a.tile.openstreetmap:128.40.168.104 -+b.tile.openstreetmap:128.40.168.104 -+c.tile.openstreetmap:128.40.168.104 -+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 ++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 # 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 +3horntail.openstreetmap:20010630001205000202b3fffeeceeac ++planet.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 # 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 @@ -117,78 +172,152 @@ +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.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 ++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 servers -+dulcy.internal.openstreetmap:10.0.0.2 ++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 -# APC power switch ++draco.openstreetmap:128.40.168.95 ++draco.ucl.openstreetmap:10.0.0.11 ++draco.oob.openstreetmap:10.0.1.11 -+apc1.internal.openstreetmap:10.0.0.49 +# Munin server -# Forum 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 -+forum.openstreetmap:93.186.179.231 +# Gosmore routing server -# Bytemark virtual machine, and the services which operate from it ++sarel.openstreetmap:128.40.168.97 ++sarel.ucl.openstreetmap:10.0.0.12 ++sarel.oob.openstreetmap:10.0.1.12 -+vm.openstreetmap:80.68.94.95 -+stats.wiki.openstreetmap:80.68.94.95 -+vm.internal.openstreetmap:10.0.0.253 +# Spare machines -# Bytemark atom machine, and the services which operate from it ++puff.ucl.openstreetmap:10.0.0.10 ++puff.oob.openstreetmap:10.0.1.10 ++idris.ucl.openstreetmap:10.0.0.4 ++idris.oob.openstreetmap:10.0.1.4 -+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 +# APC power switches + ++apc1.ucl.openstreetmap:10.0.0.49 ++apc2.ucl.openstreetmap:10.0.0.50 ++apc3.ucl.openstreetmap:10.0.0.51 + +# Managed network switches + ++switch1.openstreetmap:193.63.75.102 ++switch2.ic.openstreetmap:146.179.159.169 + +# 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.104 +3konqi.openstreetmap:2001063000120500021560fffeaa9956 ++konqi.ilo.openstreetmap:146.179.159.179 ++wiki.openstreetmap:193.63.75.104 ++dump.wiki.openstreetmap:193.63.75.104 +#+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 ++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 # 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 -# Our shop +# DMCA Notice site -Cshop.openstreetmap:virtual.fotopic.net ++dmca.openstreetmap:89.145.67.86:600 # HOT site -+hot.openstreetmap:69.163.129.108 ++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 + +# Jochen Topf's taginfo service, running on openstreetmap.de hardware + ++taginfo.openstreetmap:85.214.112.59 +3taginfo.openstreetmap:2a01023840000000002168799ac19e7e