Move nominatim to pummelzacken

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index 8483c09d363df564f557eb8ae789116a9387967a..05484d6e7ab573a2612aeb019cc2def8578f88e1 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -51,8 +51,8 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 
 # Main web servers and their aliases
 
-+spike-01.openstreetmap:193.63.75.99
-3spike-01.openstreetmap:2001063000120500021a4bfffea5fd2a
++spike-01.openstreetmap:193.63.75.99:600
+3spike-01.openstreetmap:2001063000120500021a4bfffea5fd2a:600
 #+openstreetmap:193.63.75.99:600
 #3openstreetmap:2001063000120500021a4bfffea5fd2a:600
 #+www.openstreetmap:193.63.75.99:600
@@ -64,11 +64,10 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 #+mapz.openstreetmap:193.63.75.99:600
 #3mapz.openstreetmap:2001063000120500021a4bfffea5fd2a:600
 +spike-01.ic.openstreetmap:146.179.159.162:600
-+www.ic.openstreetmap:146.179.159.162:600
 +spike-01.oob.openstreetmap:146.179.159.188:600
 
-+spike-02.openstreetmap:193.63.75.100
-3spike-02.openstreetmap:20010630001205000219bbfffe393d9e
++spike-02.openstreetmap:193.63.75.100:600
+3spike-02.openstreetmap:20010630001205000219bbfffe393d9e:600
 #+openstreetmap:193.63.75.100:600
 #3openstreetmap:20010630001205000219bbfffe393d9e:600
 #+www.openstreetmap:193.63.75.100:600
@@ -80,11 +79,10 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 #+mapz.openstreetmap:193.63.75.100:600
 #3mapz.openstreetmap:20010630001205000219bbfffe393d9e:600
 +spike-02.ic.openstreetmap:146.179.159.163:600
-+www.ic.openstreetmap:146.179.159.163:600
 +spike-02.oob.openstreetmap:146.179.159.180:600
 
-+spike-03.openstreetmap:193.63.75.103
-3spike-03.openstreetmap:20010630001205000219bbfffe398aba
++spike-03.openstreetmap:193.63.75.103:600
+3spike-03.openstreetmap:20010630001205000219bbfffe398aba:600
 #+openstreetmap:193.63.75.103:600
 #3openstreetmap:20010630001205000219bbfffe398aba:600
 #+www.openstreetmap:193.63.75.103:600
@@ -96,7 +94,6 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 #+mapz.openstreetmap:193.63.75.103:600
 #3mapz.openstreetmap:20010630001205000219bbfffe398aba:600
 +spike-03.ic.openstreetmap:146.179.159.171:600
-+www.ic.openstreetmap:146.179.159.171:600
 +spike-03.oob.openstreetmap:146.179.159.187:600
 
 +spike-04.openstreetmap:89.16.162.21
@@ -112,7 +109,6 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 +mapz.openstreetmap:89.16.162.21:600
 3mapz.openstreetmap:200141c9000200d60000000000000021:600
 +spike-04.bm.openstreetmap:10.0.32.21
-+www.bm.openstreetmap:10.0.32.21:600
 +spike-04.oob.openstreetmap:10.0.33.21
 
 +spike-05.openstreetmap:89.16.162.22
@@ -128,7 +124,6 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 +mapz.openstreetmap:89.16.162.22:600
 3mapz.openstreetmap:200141c9000200d60000000000000022:600
 +spike-05.bm.openstreetmap:10.0.32.22
-+www.bm.openstreetmap:10.0.32.22:600
 +spike-05.oob.openstreetmap:10.0.33.22
 
 # Rails application servers
@@ -156,14 +151,14 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 # Nominatim servers
 
 +pummelzacken.openstreetmap:193.60.236.18
-#+nominatim.openstreetmap:193.60.236.18:600
++nominatim.openstreetmap:193.60.236.18:600
 +pummelzacken.ucl.openstreetmap:10.0.0.20
 +pummelzacken.oob.openstreetmap:10.0.1.20
 
-+dulcy.openstreetmap:193.63.75.109
-3dulcy.openstreetmap:20010630001205000ec47afffe6696d2
-+nominatim.openstreetmap:193.63.75.109:600
-3nominatim.openstreetmap:20010630001205000ec47afffe6696d2:600
++dulcy.openstreetmap:193.63.75.109:600
+3dulcy.openstreetmap:20010630001205000ec47afffe6696d2:600
+#+nominatim.openstreetmap:193.63.75.109:600
+#3nominatim.openstreetmap:20010630001205000ec47afffe6696d2:600
 +dulcy.ic.openstreetmap:146.179.159.179:600
 #+dulcy.oob.openstreetmap:
 
@@ -183,17 +178,23 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
-+orm.openstreetmap:193.63.75.98
-3orm.openstreetmap:200106300012050002e081fffec52a8c
++orm.openstreetmap:193.63.75.98:600
+3orm.openstreetmap:200106300012050002e081fffec52a8c:600
 #+orm.ic.openstreetmap:10.0.16.2
 +orm.oob.openstreetmap:146.179.159.175:600
+
 +yevaud.openstreetmap:193.60.236.22
 +yevaud.ucl.openstreetmap:10.0.0.15
 +yevaud.oob.openstreetmap:10.0.1.15
+
 +vial.openstreetmap:138.201.195.31
 3vial.openstreetmap:2a0104f801723cde0000000000000002
+
 +scorch.openstreetmap:176.31.235.79
 3scorch.openstreetmap:200141d00002fc4f0000000000000001
+
++rhaegal.openstreetmap:161.53.248.77:600
+
 Ctile.openstreetmap:tile.geo.openstreetmap.org
 Ca.tile.openstreetmap:tile.geo.openstreetmap.org
 Cb.tile.openstreetmap:tile.geo.openstreetmap.org
@@ -201,24 +202,25 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org
 
 # Services machine
 
-+ironbelly.openstreetmap:193.63.75.107
-3ironbelly.openstreetmap:2001063000120500022590fffec4f6ef
-+backup.openstreetmap:193.63.75.107
-3backup.openstreetmap:2001063000120500022590fffec4f6ef
-+stats.openstreetmap:193.63.75.107
-3stats.openstreetmap:2001063000120500022590fffec4f6ef
-+planet.openstreetmap:193.63.75.107:600
-3planet.openstreetmap:2001063000120500022590fffec4f6ef:600
-+logstash.openstreetmap:193.63.75.107
-3logstash.openstreetmap:2001063000120500022590fffec4f6ef
-+ironbelly.ic.openstreetmap:146.179.159.177
-+ironbelly.oob.openstreetmap:146.179.159.176
-+backup.ic.openstreetmap:146.179.159.177
++ironbelly.openstreetmap:193.63.75.107:600
+3ironbelly.openstreetmap:2001063000120500022590fffec4f6ef:600
+#+backup.openstreetmap:193.63.75.107:600
+#3backup.openstreetmap:2001063000120500022590fffec4f6ef:600
+#+planet.openstreetmap:193.63.75.107:600
+#3planet.openstreetmap:2001063000120500022590fffec4f6ef:600
++stats.openstreetmap:193.63.75.107:600
+3stats.openstreetmap:2001063000120500022590fffec4f6ef:600
++logstash.openstreetmap:193.63.75.107:600
+3logstash.openstreetmap:2001063000120500022590fffec4f6ef:600
++ironbelly.ic.openstreetmap:146.179.159.177:600
++ironbelly.oob.openstreetmap:146.179.159.176:600
 
 +grisu.openstreetmap:89.16.162.20
 3grisu.openstreetmap:200141c9000200d60000000000000020
-#+planet.openstreetmap:89.16.162.20:600
-#3planet.openstreetmap:200141c9000200d60000000000000020:600
++backup.openstreetmap:89.16.162.20:600
+3backup.openstreetmap:200141c9000200d60000000000000020:600
++planet.openstreetmap:89.16.162.20:600
+3planet.openstreetmap:200141c9000200d60000000000000020:600
 +grisu.bm.openstreetmap:10.0.32.20
 +grisu.oob.openstreetmap:10.0.33.20
 
@@ -227,15 +229,13 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org
 +karm.ic.openstreetmap:146.179.159.168:600
 +karm.oob.openstreetmap:146.179.159.173:600
 
-+eddie.ucl.openstreetmap:10.0.0.10:600
-+eddie.oob.openstreetmap:10.0.1.10:600
++eddie.ucl.openstreetmap:10.0.0.10
++eddie.oob.openstreetmap:10.0.1.10
 
 +katla.bm.openstreetmap:10.0.32.40
-+db.openstreetmap:10.0.32.40:600
 +katla.oob.openstreetmap:10.0.33.40
 
 +ramoth.ic.openstreetmap:146.179.159.170:600
-+db-slave.openstreetmap:146.179.159.170:600
 +ramoth.oob.openstreetmap:146.179.159.181:600
 
 +fafnir.openstreetmap:52.50.86.69
@@ -327,7 +327,7 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org
 
 # Managed network switches
 
-+switch1.openstreetmap:193.63.75.102
++switch1.openstreetmap:193.63.75.102:600
 +switch2.ic.openstreetmap:146.179.159.169:600
 
 # Bytemark machine, and the services which operate from it
@@ -352,8 +352,8 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org
 
 # Wiki servers
 
-+ouroboros.openstreetmap:193.63.75.106
-3ouroboros.openstreetmap:200106300012050002237dfffeea813a
++ouroboros.openstreetmap:193.63.75.106:600
+3ouroboros.openstreetmap:200106300012050002237dfffeea813a:600
 #+wiki.openstreetmap:193.63.75.106:600
 #3wiki.openstreetmap:200106300012050002237dfffeea813a:600
 +ouroboros.ic.openstreetmap:146.179.159.172:600