X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/434a0b29d00f71ffd0f27d519ccfe55d2831d15e..098d696c2c5410524eb0f395b8d6ac285b58a81a:/src/openstreetmap?ds=sidebyside

diff --git a/src/openstreetmap b/src/openstreetmap
index 81046c2..c101dc0 100644
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -23,7 +23,7 @@
 
 # Delegate geo.openstreetmap.org to PowerDNS
 
-&geo.openstreetmap:89.16.179.150:a:86400
+&geo.openstreetmap:89.16.179.150:a.ns.openstreetmap:86400
 
 # Main web servers and their aliases
 
@@ -45,6 +45,15 @@
 +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
+
 # Rails application servers
 
 +draco.ic.openstreetmap:146.179.159.165
@@ -60,7 +69,7 @@
 # Gazetteer (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
 
@@ -100,14 +109,22 @@
 # 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:193.63.75.26: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
+3sjobo2.tile.openstreetmap:2a02008000003ff8020f20fffef66c09:3600
++sjobo.tile.openstreetmap:85.30.190.241:3600
+3sjobo.tile.openstreetmap:2a02008000003ff8022264fffe2a2714:3600
+
 # Services machine
 
 +horntail.openstreetmap:193.63.75.101
@@ -138,6 +155,9 @@
 +db.ic.openstreetmap:146.179.159.168
 +smaug.oob.openstreetmap:146.179.159.182
 
++ramoth.ic.openstreetmap:146.179.159.170
++ramoth.oob.openstreetmap:146.179.159.181
+
 # Development server with wildcard alias for user sites
 
 +errol.openstreetmap:128.40.168.103
@@ -159,8 +179,10 @@
 
 +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
 
 # Piwik server
@@ -170,12 +192,16 @@
 +eustace.ucl.openstreetmap:10.0.0.9
 +eustace.oob.openstreetmap:10.0.1.9
 
+# Faffy (Imagery testing server)
++faffy.ucl.openstreetmap:10.0.0.7
++faffy.oob.openstreetmap:10.0.1.7
++faffy.openstreetmap:128.40.168.108
++agri..openstreetmap:128.40.168.108
+
 # Spare machines
 
 +urmel.ucl.openstreetmap:10.0.0.6
 +urmel.oob.openstreetmap:10.0.1.6
-+faffy.ucl.openstreetmap:10.0.0.7
-+faffy.oob.openstreetmap:10.0.1.7
 +puff.ucl.openstreetmap:10.0.0.10
 +puff.oob.openstreetmap:10.0.1.10
 
@@ -205,6 +231,7 @@
 +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.0.251
 
 3shenron.openstreetmap:200141c800100996021d7dfffec3df70
@@ -215,6 +242,7 @@
 3trac.openstreetmap:200141c800100996021d7dfffec3df70
 3help.openstreetmap:200141c800100996021d7dfffec3df70
 3shop.openstreetmap:200141c800100996021d7dfffec3df70
+3dns.openstreetmap:200141c800100996021d7dfffec3df70
 
 # Wiki server
 
@@ -225,11 +253,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)
 
@@ -245,7 +279,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