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

diff --git a/src/openstreetmap b/src/openstreetmap
index e6e099a..4a31440 100644
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -66,18 +66,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
@@ -129,7 +124,6 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org:600
 
 +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
@@ -138,17 +132,6 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org:600
 +backup.ic.openstreetmap:146.179.159.164
 +horntail.oob.openstreetmap:146.179.159.186
 
-# Osmarender tile server, with wildcard alias to allow parallel loading
-
-+tah.openstreetmap:129.132.168.206
-+a.tah.openstreetmap:129.132.168.206
-+b.tah.openstreetmap:129.132.168.206
-+c.tah.openstreetmap:129.132.168.206
-+d.tah.openstreetmap:129.132.168.206
-+e.tah.openstreetmap:129.132.168.206
-+f.tah.openstreetmap:129.132.168.206
-+server.tah.openstreetmap:129.132.168.206
-
 # Database server
 
 +smaug.ic.openstreetmap:146.179.159.168
@@ -192,19 +175,25 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org:600
 +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
+# 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
++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
 
@@ -235,7 +224,7 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org:600
 +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
++shenron.bm.openstreetmap:10.0.16.3
 
 3shenron.openstreetmap:200141c800100996021d7dfffec3df70
 3mail.openstreetmap:200141c800100996021d7dfffec3df70