X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/f32736b4b4b94bed2fdce16cc5c66e6d94758e1a..438cd61d8c34e3a634b51a72a61f4beef2614aa9:/src/openstreetmap diff --git a/src/openstreetmap b/src/openstreetmap index 60e6037..ec911a9 100644 --- a/src/openstreetmap +++ b/src/openstreetmap @@ -21,25 +21,40 @@ '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:193.63.75.99 -+openstreetmap:193.63.75.99:600 -+www.openstreetmap:193.63.75.99:600 -+api.openstreetmap:193.63.75.99:600 -+maps.openstreetmap:193.63.75.99:600 -+mapz.openstreetmap:193.63.75.99:600 -+puff.ic.openstreetmap:146.179.159.162 -+puff.oob.openstreetmap:146.179.159.188 - -+fuchur.openstreetmap:193.63.75.100 -+openstreetmap:193.63.75.100:600 -+www.openstreetmap:193.63.75.100:600 -+api.openstreetmap:193.63.75.100:600 -+maps.openstreetmap:193.63.75.100:600 -+mapz.openstreetmap:193.63.75.100:600 -+fuchur.ic.openstreetmap:146.179.159.163 -+fuchur.oob.openstreetmap:146.179.159.187 ++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 # Rails application servers @@ -53,33 +68,27 @@ +rails3.ic.openstreetmap:146.179.159.167 +norbert.oob.openstreetmap:146.179.159.183 -# Gazetteer (nominatim) server +# Nominatim server +poldi.openstreetmap:128.40.168.106 -+nominatim.openstreetmap:193.63.75.98:600 ++nominatim.openstreetmap:128.40.168.106:600 +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 -# OWL server +# Tile cache server +albi.openstreetmap:128.40.168.95 -+owl.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 -# Spare server +# JXAPI server +azure.openstreetmap:128.40.168.100 +jxapi.openstreetmap:128.40.168.100 @@ -87,21 +96,38 @@ +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:193.63.75.26:600 -+a.tile.openstreetmap:193.63.75.26:600 -+b.tile.openstreetmap:128.40.168.95:600 -+c.tile.openstreetmap:128.40.168.95: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 +# 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:193.63.75.101 +planet.openstreetmap:193.63.75.101 -+munin.openstreetmap:193.63.75.101 +apt.openstreetmap:193.63.75.101 +stats.openstreetmap:193.63.75.101 +chef.openstreetmap:193.63.75.101 @@ -110,23 +136,15 @@ +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 +errol.openstreetmap:128.40.168.103 @@ -148,14 +166,41 @@ +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 ++tickets.openstreetmap:128.40.168.102 +ridley.ucl.openstreetmap:10.0.0.3 ++ridley.oob.openstreetmap:10.0.1.3 + +# Piwik server + ++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 + +# Imagery server + ++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 + +# 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 # Spare machines -+fiddlestick.ucl.openstreetmap.org:10.0.0.7 -+soup.ucl.openstreetmap.org:10.0.0.8 -+eustace.ucl.openstreetmap.org:10.0.0.9 + ++puff.ucl.openstreetmap:10.0.0.10 ++puff.oob.openstreetmap:10.0.1.10 # APC power switches @@ -183,7 +228,8 @@ +irc.openstreetmap:89.16.179.150 +help.openstreetmap:89.16.179.150 +shop.openstreetmap:89.16.179.150 -+shenron.bm.openstreetmap:10.0.0.251 ++dns.openstreetmap:89.16.179.150 ++shenron.bm.openstreetmap:10.0.16.3 3shenron.openstreetmap:200141c800100996021d7dfffec3df70 3mail.openstreetmap:200141c800100996021d7dfffec3df70 @@ -193,6 +239,7 @@ 3trac.openstreetmap:200141c800100996021d7dfffec3df70 3help.openstreetmap:200141c800100996021d7dfffec3df70 3shop.openstreetmap:200141c800100996021d7dfffec3df70 +3dns.openstreetmap:200141c800100996021d7dfffec3df70 # Wiki server @@ -203,11 +250,17 @@ #+konqi.ic.openstreetmap:10.0.16.1 #+konqi.oob.openstreetmap:10.0.17.1 -# Tile cache server +# 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) @@ -223,7 +276,10 @@ # 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