# 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
-+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
+#+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
+soup.ic.openstreetmap:146.179.159.162
+soup.oob.openstreetmap:146.179.159.188
+fiddlestick.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
++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
+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: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
++bowser.ic.openstreetmap:146.179.159.171
++bowser.oob.openstreetmap:146.179.159.180
+
# Rails application servers
+draco.ic.openstreetmap:146.179.159.165
+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
# Mapnik tile server, with wildcard alias to allow parallel loading
+yevaud.openstreetmap:128.40.168.104
-+tile.openstreetmap:193.63.75.98:600
-+a.tile.openstreetmap:193.63.75.98:600
-+b.tile.openstreetmap:193.63.75.98:600
-+c.tile.openstreetmap:193.63.75.98:600
-+parent.tile.openstreetmap:193.63.75.98:300
+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.26:3600
-+london.tile.openstreetmap:193.63.75.26:3600
-+london.tile.openstreetmap:128.40.168.95:3600
++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
+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
+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.ucl.openstreetmap:10.0.0.9
+eustace.oob.openstreetmap:10.0.1.9
-# Spare machines
+# Imagery server
-+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
++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
+
+puff.ucl.openstreetmap:10.0.0.10
+puff.oob.openstreetmap:10.0.1.10
+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
3trac.openstreetmap:200141c800100996021d7dfffec3df70
3help.openstreetmap:200141c800100996021d7dfffec3df70
3shop.openstreetmap:200141c800100996021d7dfffec3df70
+3dns.openstreetmap:200141c800100996021d7dfffec3df70
# Wiki server
#+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)
# 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