Revert "Switch nominatim to pummelzacken"

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index 94cc2551fc5b1333625891911350de9122e3c837..ed58b1a078524cdecb834d9d257702496d234ec3 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -51,78 +51,78 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 
 # Main web servers and their aliases
 
-+spike-01.openstreetmap:130.177.76.6
-#3spike-01.openstreetmap:200109780002002c0000000001720006
-#+openstreetmap:130.177.76.6:600
-#3openstreetmap:200109780002002c0000000001720006:600
-#+www.openstreetmap:130.177.76.6:600
-#3www.openstreetmap:200109780002002c0000000001720006:600
-#+api.openstreetmap:130.177.76.6:600
-#3api.openstreetmap:200109780002002c0000000001720006:600
-#+maps.openstreetmap:130.177.76.6:600
-#3maps.openstreetmap:200109780002002c0000000001720006:600
-#+mapz.openstreetmap:130.177.76.6:600
-#3mapz.openstreetmap:200109780002002c0000000001720006:600
++spike-01.openstreetmap:130.117.76.6
+3spike-01.openstreetmap:200109780002002c0000000001720006
++openstreetmap:130.117.76.6:600
+3openstreetmap:200109780002002c0000000001720006:600
++www.openstreetmap:130.117.76.6:600
+3www.openstreetmap:200109780002002c0000000001720006:600
++api.openstreetmap:130.117.76.6:600
+3api.openstreetmap:200109780002002c0000000001720006:600
++maps.openstreetmap:130.117.76.6:600
+3maps.openstreetmap:200109780002002c0000000001720006:600
++mapz.openstreetmap:130.117.76.6:600
+3mapz.openstreetmap:200109780002002c0000000001720006:600
 +spike-01.ams.openstreetmap:10.0.48.6
 +spike-01.oob.openstreetmap:10.0.49.6
 
-+spike-02.openstreetmap:130.177.76.7
-#3spike-02.openstreetmap:200109780002002c0000000001720007
-#+openstreetmap:130.177.76.7:600
-#3openstreetmap:200109780002002c0000000001720007:600
-#+www.openstreetmap:130.177.76.7:600
-#3www.openstreetmap:200109780002002c0000000001720007:600
-#+api.openstreetmap:130.177.76.7:600
-#3api.openstreetmap:200109780002002c0000000001720007:600
-#+maps.openstreetmap:130.177.76.7:600
-#3maps.openstreetmap:200109780002002c0000000001720007:600
-#+mapz.openstreetmap:130.177.76.7:600
-#3mapz.openstreetmap:200109780002002c0000000001720007:600
++spike-02.openstreetmap:130.117.76.7
+3spike-02.openstreetmap:200109780002002c0000000001720007
++openstreetmap:130.117.76.7:600
+3openstreetmap:200109780002002c0000000001720007:600
++www.openstreetmap:130.117.76.7:600
+3www.openstreetmap:200109780002002c0000000001720007:600
++api.openstreetmap:130.117.76.7:600
+3api.openstreetmap:200109780002002c0000000001720007:600
++maps.openstreetmap:130.117.76.7:600
+3maps.openstreetmap:200109780002002c0000000001720007:600
++mapz.openstreetmap:130.117.76.7:600
+3mapz.openstreetmap:200109780002002c0000000001720007:600
 +spike-02.ams.openstreetmap:10.0.48.7
 +spike-02.oob.openstreetmap:10.0.49.7
 
-+spike-03.openstreetmap:130.177.76.8
-#3spike-03.openstreetmap:200109780002002c0000000001720008
-#+openstreetmap:130.177.76.8:600
-#3openstreetmap:200109780002002c0000000001720008:600
-#+www.openstreetmap:130.177.76.8:600
-#3www.openstreetmap:200109780002002c0000000001720008:600
-#+api.openstreetmap:130.177.76.8:600
-#3api.openstreetmap:200109780002002c0000000001720008:600
-#+maps.openstreetmap:130.177.76.8:600
-#3maps.openstreetmap:200109780002002c0000000001720008:600
-#+mapz.openstreetmap:130.177.76.8:600
-#3mapz.openstreetmap:200109780002002c0000000001720008:600
++spike-03.openstreetmap:130.117.76.8
+3spike-03.openstreetmap:200109780002002c0000000001720008
++openstreetmap:130.117.76.8:600
+3openstreetmap:200109780002002c0000000001720008:600
++www.openstreetmap:130.117.76.8:600
+3www.openstreetmap:200109780002002c0000000001720008:600
++api.openstreetmap:130.117.76.8:600
+3api.openstreetmap:200109780002002c0000000001720008:600
++maps.openstreetmap:130.117.76.8:600
+3maps.openstreetmap:200109780002002c0000000001720008:600
++mapz.openstreetmap:130.117.76.8:600
+3mapz.openstreetmap:200109780002002c0000000001720008:600
 +spike-03.ams.openstreetmap:10.0.48.8
 +spike-03.oob.openstreetmap:10.0.49.8
 
 +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
 +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
 +spike-05.oob.openstreetmap:10.0.33.22
 
@@ -151,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:130.117.76.9
-#3dulcy.openstreetmap:200109780002002c0000000001720009
-#+nominatim.openstreetmap:130.117.76.9:600
-#3nominatim.openstreetmap:200109780002002c0000000001720009:600
+3dulcy.openstreetmap:200109780002002c0000000001720009
++nominatim.openstreetmap:130.117.76.9:600
+3nominatim.openstreetmap:200109780002002c0000000001720009:600
 +dulcy.ams.openstreetmap:10.0.48.9
 +dulcy.oob.openstreetmap:10.0.49.9
 
@@ -179,7 +179,7 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +orm.openstreetmap:130.117.76.3
-#3orm.openstreetmap:200109780002002c0000000001720003
+3orm.openstreetmap:200109780002002c0000000001720003
 +orm.ams.openstreetmap:10.0.48.3
 +orm.oob.openstreetmap:10.0.49.3
 
@@ -187,9 +187,6 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 +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
 
@@ -203,24 +200,24 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org
 # Services machine
 
 +ironbelly.openstreetmap:130.117.76.10
-#3ironbelly.openstreetmap:200109780002002c000000000172000a
-#+backup.openstreetmap:130.117.76.10:600
-#3backup.openstreetmap:200109780002002c000000000172000a:600
-#+planet.openstreetmap:130.117.76.10:600
-#3planet.openstreetmap:200109780002002c000000000172000a:600
+3ironbelly.openstreetmap:200109780002002c000000000172000a
++backup.openstreetmap:130.117.76.10:600
+3backup.openstreetmap:200109780002002c000000000172000a:600
++planet.openstreetmap:130.117.76.10:600
+3planet.openstreetmap:200109780002002c000000000172000a:600
 +stats.openstreetmap:130.117.76.10
-#3stats.openstreetmap:200109780002002c000000000172000a
+3stats.openstreetmap:200109780002002c000000000172000a
 +logstash.openstreetmap:130.117.76.10
-#3logstash.openstreetmap:200109780002002c000000000172000a
+3logstash.openstreetmap:200109780002002c000000000172000a
 +ironbelly.ams.openstreetmap:10.0.48.10
 +ironbelly.oob.openstreetmap:10.0.49.10
 
 +grisu.openstreetmap:89.16.162.20
 3grisu.openstreetmap:200141c9000200d60000000000000020
-+backup.openstreetmap:89.16.162.20:600
-3backup.openstreetmap:200141c9000200d60000000000000020:600
-+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
 
@@ -327,7 +324,13 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org
 
 # Managed network switches
 
-+switch1.openstreetmap:130.177.76.30
++switch1.openstreetmap:130.117.76.2
+3switch1.openstreetmap:200109780002002c0000000001720002
+
+# Managed power strips
+
++pdu1.ams.openstreetmap:10.0.48.100
++pdu2.ams.openstreetmap:10.0.48.101
 
 # Bytemark machine, and the services which operate from it
 
@@ -352,16 +355,16 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org
 # Wiki servers
 
 +ouroboros.openstreetmap:130.117.76.4
-#3ouroboros.openstreetmap:200109780002002c0000000001720004
-#+wiki.openstreetmap:130.117.76.4:600
-#3wiki.openstreetmap:200109780002002c0000000001720004:600
+3ouroboros.openstreetmap:200109780002002c0000000001720004
++wiki.openstreetmap:130.117.76.4:600
+3wiki.openstreetmap:200109780002002c0000000001720004:600
 +ouroboros.ams.openstreetmap:10.0.48.4
 +ouroboros.oob.openstreetmap:10.0.49.4
 
 +stormfly-01.openstreetmap:140.211.167.104
 6stormfly-01.openstreetmap:2605bc8030100700000000008cdea768
-+wiki.openstreetmap:140.211.167.104:600
-3wiki.openstreetmap:2605bc8030100700000000008cdea768:600
+#+wiki.openstreetmap:140.211.167.104:600
+#3wiki.openstreetmap:2605bc8030100700000000008cdea768:600
 +stormfly-01.oob.openstreetmap:10.0.0.99
 
 # GPS tile server
@@ -419,8 +422,9 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org
 #3angor.openstreetmap:200143f801f40b00b283fefffed8dd45
 +ladon.openstreetmap:83.212.2.116
 3ladon.openstreetmap:200106482ffe00040000000000000116
-+komodo.openstreetmap:103.253.107.131
 +ascalon.openstreetmap:184.107.48.228
++noomoahk.openstreetmap:91.224.148.166
+3noomoahk.openstreetmap:2a0372208080a6000000000000000001
 
 # Blades
 
@@ -471,4 +475,4 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org
 
 # Uptime site at StatusCake
 
-Cuptime.openstreetmap:uptime.statuscake.com
+Cuptime.openstreetmap:uptimessl.statuscake.com