X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/2beda093d2b86a4bbb2c042684521573a78aa273..193ccf4d0c0d4241120e77a28b6f4aeb8b93dde3:/src/openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index 4a31440..c43d22b 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,48 +24,55 @@
 
 # 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
 +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
-+soup.ic.openstreetmap:146.179.159.162
-+soup.oob.openstreetmap:146.179.159.188
++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
 +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
-+fiddlestick.ic.openstreetmap:146.179.159.163
-+fiddlestick.oob.openstreetmap:146.179.159.187
++spike-02.ic.openstreetmap:146.179.159.163
++www.ic.openstreetmap:146.179.159.163:3600
++spike-02.oob.openstreetmap:146.179.159.180
 
-+bowser.openstreetmap:193.63.75.103
++spike-03.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
++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
 
 # Nominatim server
 
@@ -88,11 +96,11 @@
 
 # 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
 
@@ -116,9 +124,11 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org:600
 
 +london.tile.openstreetmap:193.63.75.98:3600
 +sjobo2.tile.openstreetmap:85.30.159.149:3600
-3sjobo2.tile.openstreetmap:2a02008000003ff8020f20fffef66c09:3600
+# remove IPv6 until we have IPv6 capable squid
+# 3sjobo2.tile.openstreetmap:2a02008000003ff8020f20fffef66c09:3600
 +sjobo.tile.openstreetmap:85.30.190.241:3600
-3sjobo.tile.openstreetmap:2a02008000003ff8022264fffe2a2714:3600
+# remove IPv6 until we have IPv6 capable squid
+# 3sjobo.tile.openstreetmap:2a02008000003ff8022264fffe2a2714:3600
 
 # Services machine
 
@@ -135,10 +145,10 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org:600
 # 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
@@ -165,8 +175,8 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org: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
 
@@ -267,7 +277,7 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org:600
  
 # Donation site
 
-+donate.openstreetmap:89.145.67.86
++donate.openstreetmap:89.145.67.86:600
 
 # HOT site