Replace sarel with thorn-02

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index 3183a7d7efba73a4290704d6910629ac7790350b..74253c5404215908f687f36bf02029aca6843752 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -29,41 +29,43 @@
 
 # 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
-+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
-+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
++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
 
-+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
++thorn-02.oob.openstreetmap:146.179.159.184
+
 +norbert.ic.openstreetmap:146.179.159.167
 +rails3.ic.openstreetmap:146.179.159.167
 +norbert.oob.openstreetmap:146.179.159.183
@@ -118,9 +120,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
 
@@ -137,10 +141,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