# Main web servers and their aliases
-+spike-01.openstreetmap:130.177.76.6
-#3spike-01.openstreetmap:200109780002002c0000000001721006
-#+openstreetmap:130.177.76.6:600
-#3openstreetmap:200109780002002c0000000001721006:600
-#+www.openstreetmap:130.177.76.6:600
-#3www.openstreetmap:200109780002002c0000000001721006:600
-#+api.openstreetmap:130.177.76.6:600
-#3api.openstreetmap:200109780002002c0000000001721006:600
-#+maps.openstreetmap:130.177.76.6:600
-#3maps.openstreetmap:200109780002002c0000000001721006:600
-#+mapz.openstreetmap:130.177.76.6:600
-#3mapz.openstreetmap:200109780002002c0000000001721006: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:200109780002002c0000000001721007
-#+openstreetmap:130.177.76.7:600
-#3openstreetmap:200109780002002c0000000001721007:600
-#+www.openstreetmap:130.177.76.7:600
-#3www.openstreetmap:200109780002002c0000000001721007:600
-#+api.openstreetmap:130.177.76.7:600
-#3api.openstreetmap:200109780002002c0000000001721007:600
-#+maps.openstreetmap:130.177.76.7:600
-#3maps.openstreetmap:200109780002002c0000000001721007:600
-#+mapz.openstreetmap:130.177.76.7:600
-#3mapz.openstreetmap:200109780002002c0000000001721007: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:200109780002002c0000000001721008
-#+openstreetmap:130.177.76.8:600
-#3openstreetmap:200109780002002c0000000001721008:600
-#+www.openstreetmap:130.177.76.8:600
-#3www.openstreetmap:200109780002002c0000000001721008:600
-#+api.openstreetmap:130.177.76.8:600
-#3api.openstreetmap:200109780002002c0000000001721008:600
-#+maps.openstreetmap:130.177.76.8:600
-#3maps.openstreetmap:200109780002002c0000000001721008:600
-#+mapz.openstreetmap:130.177.76.8:600
-#3mapz.openstreetmap:200109780002002c0000000001721008: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
# 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.1
-#3dulcy.openstreetmap:200109780002002c0000000001721001
-#+nominatim.openstreetmap:130.117.76.1:600
-#3nominatim.openstreetmap:200109780002002c0000000001721001:600
-+dulcy.ams.openstreetmap:10.0.48.1
-+dulcy.oob.openstreetmap:10.0.49.1
++dulcy.openstreetmap:130.117.76.9
+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
# OWL server
# Mapnik tile server, with wildcard alias to allow parallel loading
+orm.openstreetmap:130.117.76.3
-#3orm.openstreetmap:200109780002002c0000000001721003
+3orm.openstreetmap:200109780002002c0000000001720003
+orm.ams.openstreetmap:10.0.48.3
+orm.oob.openstreetmap:10.0.49.3
# Services machine
-+ironbelly.openstreetmap:130.117.76.2
-#3ironbelly.openstreetmap:200109780002002c0000000001721002
-#+backup.openstreetmap:130.117.76.2:600
-#3backup.openstreetmap:200109780002002c0000000001721002:600
-#+planet.openstreetmap:130.117.76.2:600
-#3planet.openstreetmap:200109780002002c0000000001721002:600
-+stats.openstreetmap:130.117.76.2
-#3stats.openstreetmap:200109780002002c0000000001721002
-+logstash.openstreetmap:130.117.76.2
-#3logstash.openstreetmap:200109780002002c0000000001721002
-+ironbelly.ams.openstreetmap:10.0.48.2
-+ironbelly.oob.openstreetmap:10.0.49.2
++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
++stats.openstreetmap:130.117.76.10
+3stats.openstreetmap:200109780002002c000000000172000a
++logstash.openstreetmap:130.117.76.10
+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
+#+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
# 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
# Wiki servers
+ouroboros.openstreetmap:130.117.76.4
-#3ouroboros.openstreetmap:200109780002002c0000000001721004
-#+wiki.openstreetmap:130.117.76.4:600
-#3wiki.openstreetmap:200109780002002c0000000001721004: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
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