Correct locations for orm and yevaud

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index 6b14d3aca59894eef057cb405cca1c6ecb013ca5..5d07ea04a05172edd40e81778400ec184e4bb329 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -47,97 +47,97 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 
 +spike-01.openstreetmap:193.63.75.99
 3spike-01.openstreetmap:2001063000120500021a4bfffea5fd2a
-#+openstreetmap:193.63.75.99:600
-#3openstreetmap:2001063000120500021a4bfffea5fd2a:600
-#+www.openstreetmap:193.63.75.99:600
-#3www.openstreetmap:2001063000120500021a4bfffea5fd2a:600
-#+api.openstreetmap:193.63.75.99:600
-#3api.openstreetmap:2001063000120500021a4bfffea5fd2a:600
-#+maps.openstreetmap:193.63.75.99:600
-#3maps.openstreetmap:2001063000120500021a4bfffea5fd2a:600
-#+mapz.openstreetmap:193.63.75.99:600
-#3mapz.openstreetmap:2001063000120500021a4bfffea5fd2a:600
-+spike-01.ic.openstreetmap:146.179.159.162
-+www.ic.openstreetmap:146.179.159.162:3600
-+spike-01.oob.openstreetmap:146.179.159.188
++openstreetmap:193.63.75.99:600
+3openstreetmap:2001063000120500021a4bfffea5fd2a:600
++www.openstreetmap:193.63.75.99:600
+3www.openstreetmap:2001063000120500021a4bfffea5fd2a:600
++api.openstreetmap:193.63.75.99:600
+3api.openstreetmap:2001063000120500021a4bfffea5fd2a:600
++maps.openstreetmap:193.63.75.99:600
+3maps.openstreetmap:2001063000120500021a4bfffea5fd2a:600
++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
-#+openstreetmap:193.63.75.100:600
-#3openstreetmap:20010630001205000219bbfffe393d9e:600
-#+www.openstreetmap:193.63.75.100:600
-#3www.openstreetmap:20010630001205000219bbfffe393d9e:600
-#+api.openstreetmap:193.63.75.100:600
-#3api.openstreetmap:20010630001205000219bbfffe393d9e:600
-#+maps.openstreetmap:193.63.75.100:600
-#3maps.openstreetmap:20010630001205000219bbfffe393d9e:600
-#+mapz.openstreetmap:193.63.75.100:600
-#3mapz.openstreetmap:20010630001205000219bbfffe393d9e:600
-+spike-02.ic.openstreetmap:146.179.159.163
-+www.ic.openstreetmap:146.179.159.163:3600
-+spike-02.oob.openstreetmap:146.179.159.180
++openstreetmap:193.63.75.100:600
+3openstreetmap:20010630001205000219bbfffe393d9e:600
++www.openstreetmap:193.63.75.100:600
+3www.openstreetmap:20010630001205000219bbfffe393d9e:600
++api.openstreetmap:193.63.75.100:600
+3api.openstreetmap:20010630001205000219bbfffe393d9e:600
++maps.openstreetmap:193.63.75.100:600
+3maps.openstreetmap:20010630001205000219bbfffe393d9e:600
++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
-#+openstreetmap:193.63.75.103:600
-#3openstreetmap:20010630001205000219bbfffe398aba:600
-#+www.openstreetmap:193.63.75.103:600
-#3www.openstreetmap:20010630001205000219bbfffe398aba:600
-#+api.openstreetmap:193.63.75.103:600
-#3api.openstreetmap:20010630001205000219bbfffe398aba:600
-#+maps.openstreetmap:193.63.75.103:600
-#3maps.openstreetmap:20010630001205000219bbfffe398aba:600
-#+mapz.openstreetmap:193.63.75.103:600
-#3mapz.openstreetmap:20010630001205000219bbfffe398aba:600
-+spike-03.ic.openstreetmap:146.179.159.171
-+www.ic.openstreetmap:146.179.159.171:3600
-+spike-03.oob.openstreetmap:146.179.159.187
++openstreetmap:193.63.75.103:600
+3openstreetmap:20010630001205000219bbfffe398aba:600
++www.openstreetmap:193.63.75.103:600
+3www.openstreetmap:20010630001205000219bbfffe398aba:600
++api.openstreetmap:193.63.75.103:600
+3api.openstreetmap:20010630001205000219bbfffe398aba:600
++maps.openstreetmap:193.63.75.103:600
+3maps.openstreetmap:20010630001205000219bbfffe398aba:600
++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
 3spike-04.openstreetmap:200141c9000200d60000000000000021
-+openstreetmap:89.16.162.21:600
-3openstreetmap:200141c9000200d60000000000000021:600
-+www.openstreetmap:89.16.162.21:600
-3www.openstreetmap:200141c9000200d60000000000000021:600
-+api.openstreetmap:89.16.162.21:600
-3api.openstreetmap:200141c9000200d60000000000000021:600
-+maps.openstreetmap:89.16.162.21:600
-3maps.openstreetmap:200141c9000200d60000000000000021:600
-+mapz.openstreetmap:89.16.162.21:600
-3mapz.openstreetmap:200141c9000200d60000000000000021:600
+#+openstreetmap:89.16.162.21:600
+#3openstreetmap:200141c9000200d60000000000000021:600
+#+www.openstreetmap:89.16.162.21:600
+#3www.openstreetmap:200141c9000200d60000000000000021:600
+#+api.openstreetmap:89.16.162.21:600
+#3api.openstreetmap:200141c9000200d60000000000000021:600
+#+maps.openstreetmap:89.16.162.21:600
+#3maps.openstreetmap:200141c9000200d60000000000000021:600
+#+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:3600
++www.bm.openstreetmap:10.0.32.21:600
 +spike-04.oob.openstreetmap:10.0.33.21
 
 +spike-05.openstreetmap:89.16.162.22
 3spike-05.openstreetmap:200141c9000200d60000000000000022
-+openstreetmap:89.16.162.22:600
-3openstreetmap:200141c9000200d60000000000000022:600
-+www.openstreetmap:89.16.162.22:600
-3www.openstreetmap:200141c9000200d60000000000000022:600
-+api.openstreetmap:89.16.162.22:600
-3api.openstreetmap:200141c9000200d60000000000000022:600
-+maps.openstreetmap:89.16.162.22:600
-3maps.openstreetmap:200141c9000200d60000000000000022:600
-+mapz.openstreetmap:89.16.162.22:600
-3mapz.openstreetmap:200141c9000200d60000000000000022:600
+#+openstreetmap:89.16.162.22:600
+#3openstreetmap:200141c9000200d60000000000000022:600
+#+www.openstreetmap:89.16.162.22:600
+#3www.openstreetmap:200141c9000200d60000000000000022:600
+#+api.openstreetmap:89.16.162.22:600
+#3api.openstreetmap:200141c9000200d60000000000000022:600
+#+maps.openstreetmap:89.16.162.22:600
+#3maps.openstreetmap:200141c9000200d60000000000000022:600
+#+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:3600
++www.bm.openstreetmap:10.0.32.22:600
 +spike-05.oob.openstreetmap:10.0.33.22
 
 # Rails application servers
 
-+thorn-01.ic.openstreetmap:146.179.159.165
-+rails1.ic.openstreetmap:146.179.159.165
-+thorn-01.oob.openstreetmap:146.179.159.185
++thorn-01.ic.openstreetmap:146.179.159.165:600
++rails1.ic.openstreetmap:146.179.159.165:600
++thorn-01.oob.openstreetmap:146.179.159.185:600
 
-+thorn-02.ic.openstreetmap:146.179.159.166
-+rails2.ic.openstreetmap:146.179.159.166
-+thorn-02.oob.openstreetmap:146.179.159.184
++thorn-02.ic.openstreetmap:146.179.159.166:600
++rails2.ic.openstreetmap:146.179.159.166:600
++thorn-02.oob.openstreetmap:146.179.159.184:600
 
-+thorn-03.ic.openstreetmap:146.179.159.167
-+rails3.ic.openstreetmap:146.179.159.167
-+thorn-03.oob.openstreetmap:146.179.159.183
++thorn-03.ic.openstreetmap:146.179.159.167:600
++rails3.ic.openstreetmap:146.179.159.167:600
++thorn-03.oob.openstreetmap:146.179.159.183:600
 
 +thorn-04.bm.openstreetmap:10.0.32.41
 +rails4.bm.openstreetmap:10.0.32.41
@@ -153,19 +153,19 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 3poldi.openstreetmap:200106300012050002e081fffec5333e
 #+nominatim.openstreetmap:193.63.75.101:600
 #3nominatim.openstreetmap:200106300012050002e081fffec5333e:600
-+poldi.ic.openstreetmap:146.179.159.164
-+poldi.oob.openstreetmap:146.179.159.186
++poldi.ic.openstreetmap:146.179.159.164:600
++poldi.oob.openstreetmap:146.179.159.186:600
 
 +pummelzacken.openstreetmap:128.40.45.204
-+nominatim.openstreetmap:128.40.45.204:600
+#+nominatim.openstreetmap:128.40.45.204: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.ic.openstreetmap:146.179.159.179
++nominatim.openstreetmap:193.63.75.109:600
+3nominatim.openstreetmap:20010630001205000ec47afffe6696d2:600
++dulcy.ic.openstreetmap:146.179.159.179:600
 #+dulcy.oob.openstreetmap:
 
 # JXAPI server
@@ -182,23 +182,28 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 +zark.ucl.openstreetmap:10.0.0.8
 +zark.oob.openstreetmap:10.0.1.8
 
-# Taginfo server
+# Taginfo servers
 
 +grindtooth.openstreetmap:128.40.45.199
-#+taginfo.openstreetmap:128.40.45.199:600
-+taginfo.openstreetmap:140.211.167.104:600
++taginfo.openstreetmap:128.40.45.199:600
 +grindtooth.ucl.openstreetmap:10.0.0.19
 +grindtooth.oob.openstreetmap:10.0.1.19
 
++stormfly-01.openstreetmap:140.211.167.104
+#+taginfo.openstreetmap:140.211.167.104:600
++stormfly-01.oob.openstreetmap:10.0.0.99
+
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +orm.openstreetmap:193.63.75.98
 3orm.openstreetmap:200106300012050002e081fffec52a8c
 #+orm.ic.openstreetmap:10.0.16.2
-+orm.oob.openstreetmap:146.179.159.175
++orm.oob.openstreetmap:146.179.159.175:600
 +yevaud.openstreetmap:128.40.45.208
 +yevaud.ucl.openstreetmap:10.0.0.15
 +yevaud.oob.openstreetmap:10.0.1.15
++vial.openstreetmap:138.201.195.31
+3vial.openstreetmap:2a0104f801723cde0000000000000002
 Ctile.openstreetmap:tile.geo.openstreetmap.org
 Ca.tile.openstreetmap:tile.geo.openstreetmap.org
 Cb.tile.openstreetmap:tile.geo.openstreetmap.org
@@ -221,9 +226,9 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 3logstash.openstreetmap:2001063000120500022590fffec4f6ef
 +hardware.openstreetmap:193.63.75.107
 3hardware.openstreetmap:2001063000120500022590fffec4f6ef
-+ironbelly.ic.openstreetmap:146.179.159.177
-+ironbelly.oob.openstreetmap:146.179.159.176
-+backup.ic.openstreetmap:146.179.159.177
++ironbelly.ic.openstreetmap:146.179.159.177:600
++ironbelly.oob.openstreetmap:146.179.159.176:600
++backup.ic.openstreetmap:146.179.159.177:600
 
 +grisu.openstreetmap:89.16.162.20
 3grisu.openstreetmap:200141c9000200d60000000000000020
@@ -234,16 +239,16 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 
 # Database servers
 
-+karm.ic.openstreetmap:146.179.159.168
-+karm.oob.openstreetmap:146.179.159.173
++karm.ic.openstreetmap:146.179.159.168:600
++karm.oob.openstreetmap:146.179.159.173:600
 
 +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
++ramoth.ic.openstreetmap:146.179.159.170:600
 +db-slave.openstreetmap:146.179.159.170:600
-+ramoth.oob.openstreetmap:146.179.159.181
++ramoth.oob.openstreetmap:146.179.159.181:600
 
 +fafnir.openstreetmap:52.50.86.69
 
@@ -264,7 +269,6 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 
 +ridley.openstreetmap:128.40.45.205
 +otrs.openstreetmap:128.40.45.205
-+thinkup.openstreetmap:128.40.45.205
 +blog.openstreetmap:128.40.45.205
 +foundation.openstreetmap:128.40.45.205
 +ridley.ucl.openstreetmap:10.0.0.3
@@ -280,23 +284,27 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 # Imagery servers
 
 +draco.openstreetmap:128.40.45.195
-+os.openstreetmap:128.40.45.195:3600
-+a.os.openstreetmap:128.40.45.195:3600
-+b.os.openstreetmap:128.40.45.195:3600
-+c.os.openstreetmap:128.40.45.195:3600
 +draco.ucl.openstreetmap:10.0.0.11
 +draco.oob.openstreetmap:10.0.1.11
 
 +kessie.openstreetmap:178.250.74.36
 3kessie.openstreetmap:2a02165800040000dad385fffe5d875e
-#+agri.openstreetmap:178.250.74.36:3600
-#3agri.openstreetmap:2a02165800040000dad385fffe5d875e:3600
-#+a.agri.openstreetmap:178.250.74.36:3600
-#3a.agri.openstreetmap:2a02165800040000dad385fffe5d875e:3600
-#+b.agri.openstreetmap:178.250.74.36:3600
-#3b.agri.openstreetmap:2a02165800040000dad385fffe5d875e:3600
-#+c.agri.openstreetmap:178.250.74.36:3600
-#3c.agri.openstreetmap:2a02165800040000dad385fffe5d875e:3600
++agri.openstreetmap:178.250.74.36:3600
+3agri.openstreetmap:2a02165800040000dad385fffe5d875e:3600
++a.agri.openstreetmap:178.250.74.36:3600
+3a.agri.openstreetmap:2a02165800040000dad385fffe5d875e:3600
++b.agri.openstreetmap:178.250.74.36:3600
+3b.agri.openstreetmap:2a02165800040000dad385fffe5d875e:3600
++c.agri.openstreetmap:178.250.74.36:3600
+3c.agri.openstreetmap:2a02165800040000dad385fffe5d875e:3600
++os.openstreetmap:178.250.74.36:3600
+3os.openstreetmap:2a02165800040000dad385fffe5d875e:3600
++a.os.openstreetmap:178.250.74.36:3600
+3a.os.openstreetmap:2a02165800040000dad385fffe5d875e:3600
++b.os.openstreetmap:178.250.74.36:3600
+3b.os.openstreetmap:2a02165800040000dad385fffe5d875e:3600
++c.os.openstreetmap:178.250.74.36:3600
+3c.os.openstreetmap:2a02165800040000dad385fffe5d875e:3600
 +kessie.oob.openstreetmap:178.250.74.37
 
 # Munin server
@@ -344,7 +352,7 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 # Managed network switches
 
 +switch1.openstreetmap:193.63.75.102
-+switch2.ic.openstreetmap:146.179.159.169
++switch2.ic.openstreetmap:146.179.159.169:600
 
 # Forum server
 
@@ -379,8 +387,8 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 +ouroboros.openstreetmap:193.63.75.106
 3ouroboros.openstreetmap:200106300012050002237dfffeea813a
 +wiki.openstreetmap:193.63.75.106:600
-+ouroboros.ic.openstreetmap:146.179.159.172
-+ouroboros.oob.openstreetmap:146.179.159.178
++ouroboros.ic.openstreetmap:146.179.159.172:600
++ouroboros.oob.openstreetmap:146.179.159.178:600
 
 # GPS tile server
 
@@ -427,6 +435,8 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 3sarkany.openstreetmap:20014c480002bf04025056fffe8f5c81
 +cmok.openstreetmap:31.130.201.40
 3cmok.openstreetmap:2001067c22681005021e8cfffe8c8d3b
++stormfly-02.openstreetmap:140.211.167.105
++stormfly-02.oob.openstreetmap:10.0.0.108
 
 # Blog aggregator (on Shaun McDonald's VM)
 
@@ -452,10 +462,3 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 +humanitarian.openstreetmap:144.76.31.210
 +hot-staging.openstreetmap:144.76.31.210
 +hot-dev.openstreetmap:144.76.31.210
-
-# OSUOSL machines
-
-+stormfly-01.openstreetmap:140.211.167.104
-+stormfly-01.oob.openstreetmap:10.0.0.99
-+stormfly-02.openstreetmap:140.211.167.105
-+stormfly-02.oob.openstreetmap:10.0.0.108