X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/4da966519a4bc72fe485a39d8c46a108edb6dd28..c079aa6b89658934fbc5e7c328e40662cbf432f3:/src/openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index d1e2086..ad73e71 100644
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -23,7 +23,9 @@
 
 # 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
 
@@ -66,18 +68,13 @@
 +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: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
@@ -121,15 +118,16 @@ 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
 
 +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
@@ -141,10 +139,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
@@ -173,6 +171,7 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org:600
 +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
 
@@ -191,10 +190,15 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org:600
 +faffy.ucl.openstreetmap:10.0.0.7
 +faffy.oob.openstreetmap:10.0.1.7
 
-# Spare machines
+# 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