X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/2a7a36302d927626cc18f19579d51cf7c3b0222c..30c62e7bc786554f62c60f036269ab13e599fad5:/src/openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index 8c143c5..1abbab6 100644
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -37,7 +37,7 @@
 +maps.openstreetmap:193.63.75.99:600
 +mapz.openstreetmap:193.63.75.99:600
 +spike-01.ic.openstreetmap:146.179.159.162
-+www.ic.openstreetmap:146.179.159.162:300
++www.ic.openstreetmap:146.179.159.162:3600
 +spike-01.oob.openstreetmap:146.179.159.188
 
 +spike-02.openstreetmap:193.63.75.100
@@ -47,7 +47,7 @@
 +maps.openstreetmap:193.63.75.100:600
 +mapz.openstreetmap:193.63.75.100:600
 +spike-02.ic.openstreetmap:146.179.159.163
-+www.ic.openstreetmap:146.179.159.163:300
++www.ic.openstreetmap:146.179.159.163:3600
 +spike-02.oob.openstreetmap:146.179.159.180
 
 +spike-03.openstreetmap:193.63.75.103
@@ -57,7 +57,7 @@
 +maps.openstreetmap:193.63.75.103:600
 +mapz.openstreetmap:193.63.75.103:600
 +spike-03.ic.openstreetmap:146.179.159.171
-+www.ic.openstreetmap:146.179.159.171:300
++www.ic.openstreetmap:146.179.159.171:3600
 +spike-03.oob.openstreetmap:146.179.159.187
 
 # Rails application servers
@@ -96,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
 
@@ -123,12 +123,13 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org:600
 # 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
++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
 
 # Services machine
 
@@ -161,10 +162,6 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org:600
 +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.ucl.openstreetmap:10.0.0.14
 +errol.oob.openstreetmap:10.0.1.14
 
@@ -188,10 +185,14 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org:600
 # 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
++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
 
@@ -260,12 +261,12 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org:600
 +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
++gorynych.openstreetmap:130.193.62.73
++bunyip.openstreetmap:203.26.72.12
+3bunyip.openstreetmap:2402640000010006021708fffe5640c3
 
 # Blog aggregator (on Shaun McDonald's VM)
 
@@ -279,6 +280,10 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org:600
 
 +donate.openstreetmap:89.145.67.86:600
 
+# DMCA Notice site
+
++dmca.openstreetmap:89.145.67.86:600
+
 # HOT site
 
 +hot.openstreetmap:50.56.49.247