Move norbert's external IP to grindtooth

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index 3722b590289ffe32479ec31f7d2a382d53679fad..028e031d7ce75a29181d8988b01fc177208243c3 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -14,7 +14,6 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 # Make the virtual machine the primary MX with Bytemark as backup
 
 @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
@@ -109,9 +108,7 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 
 # JXAPI server
 
-+norbert.openstreetmap:128.40.168.100
-+jxapi.openstreetmap:128.40.168.100
-+norbert.ilo.openstreetmap:10.0.0.55
++jxapi.openstreetmap:128.40.168.108:600
 +norbert.ucl.openstreetmap:10.0.0.5
 +norbert.oob.openstreetmap:10.0.1.5
 
@@ -122,6 +119,13 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 +zark.ucl.openstreetmap:10.0.0.8
 +zark.oob.openstreetmap:10.0.1.8
 
+# Taginfo server
+
++grindtooth.openstreetmap:128.40.168.100
++taginfo.openstreetmap:128.40.168.100
++grindtooth.ucl.openstreetmap:10.0.0.19
++grindtooth.oob.openstreetmap:10.0.1.19
+
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +orm.openstreetmap:193.63.75.98
@@ -226,11 +230,22 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 +sarel.ucl.openstreetmap:10.0.0.12
 +sarel.oob.openstreetmap:10.0.1.12
 
+# Forum server
+
++clifford.openstreetmap:128.40.168.98
++clifford.ucl.openstreetmap:10.0.0.17
++clifford.oob.openstreetmap:10.0.1.17
+
+# Loan machine for emacsen
+
++ascalon.openstreetmap:128.40.168.105
++ascalon.ucl.openstreetmap:10.0.0.18
++ascalon.oob.openstreetmap:10.0.1.18
+
 # Spare machines
 
 +puff.ucl.openstreetmap:10.0.0.10
 +puff.oob.openstreetmap:10.0.1.10
-+idris.openstreetmap:128.40.168.98
 +idris.ucl.openstreetmap:10.0.0.4
 +idris.oob.openstreetmap:10.0.1.4
 
@@ -247,7 +262,7 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 
 # Forum server
 
-+forum.openstreetmap:93.186.179.231
++forum.openstreetmap:93.186.179.231:600
 
 # Bytemark machine, and the services which operate from it
 
@@ -286,7 +301,7 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 +noquiklos.openstreetmap:128.40.168.99
 +gps.tile.openstreetmap:128.40.168.99
 +gps-a.tile.openstreetmap:128.40.168.99
-+gps-d.tile.openstreetmap:128.40.168.99
++gps-b.tile.openstreetmap:128.40.168.99
 +gps-c.tile.openstreetmap:128.40.168.99
 +a.gps-tile.openstreetmap:128.40.168.99
 +b.gps-tile.openstreetmap:128.40.168.99
@@ -308,8 +323,11 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 +ridgeback.openstreetmap:31.169.50.10
 +ridgeback.oob.openstreetmap:31.169.50.14
 +jakelong.openstreetmap:64.62.205.202
+3jakelong.openstreetmap:2001047000010041a80000fffe3ecdca
 +nepomuk.openstreetmap:77.95.70.166
-3nepomuk.openstreetmap:200107f80047002100000000000000a6
+3nepomuk.openstreetmap:2a0391800001002100000000000000a6
++simurgh.openstreetmap:94.20.20.55
+
 +tabaluga.openstreetmap:5.9.150.236
 3tabaluga.openstreetmap:2a0104f8019033eb0000000000000002
 +nadder-01.openstreetmap:192.163.219.36
@@ -326,20 +344,20 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
  
 # Donation site
 
-+donate.openstreetmap:89.145.67.86:600
++donate.openstreetmap:46.43.50.94:600
 
 # DMCA Notice site
 
-+dmca.openstreetmap:89.145.67.86:600
++dmca.openstreetmap:46.43.50.94:600
 
 # HOT site
 
-+hot.openstreetmap:50.56.49.247
-+humanitarian.openstreetmap:50.56.49.247
-+hot-staging.openstreetmap:50.56.49.247
-+hot-dev.openstreetmap:50.56.49.247
++hot.openstreetmap:144.76.31.210
++humanitarian.openstreetmap:144.76.31.210
++hot-staging.openstreetmap:144.76.31.210
++hot-dev.openstreetmap:144.76.31.210
 
 # Jochen Topf's taginfo service, running on openstreetmap.de hardware
 
-+taginfo.openstreetmap:85.214.112.59
-3taginfo.openstreetmap:2a01023840000000002168799ac19e7e
++taginfo.openstreetmap:85.214.112.59:600
+3taginfo.openstreetmap:2a01023840000000002168799ac19e7e:600