From 17fd5cc5e2459b0c4349b018a787d95c88597b89 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 26 Jul 2018 14:30:11 +0100 Subject: [PATCH 01/16] Add IPv6 address for Amsterdam switch --- src/openstreetmap | 1 + 1 file changed, 1 insertion(+) diff --git a/src/openstreetmap b/src/openstreetmap index 667fe24..33a648d 100644 --- a/src/openstreetmap +++ b/src/openstreetmap @@ -328,6 +328,7 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org # Managed network switches +switch1.openstreetmap:130.117.76.2 +3switch1.openstreetmap:200109780002002c0000000001720002 # Bytemark machine, and the services which operate from it -- 2.39.5 From a4f0f21a5963edd46a36bcda23af36a837884539 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 26 Jul 2018 14:36:07 +0100 Subject: [PATCH 02/16] Add IP addresses for PDUs --- src/openstreetmap | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/openstreetmap b/src/openstreetmap index 33a648d..88d5bcb 100644 --- a/src/openstreetmap +++ b/src/openstreetmap @@ -330,6 +330,11 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org +switch1.openstreetmap:130.117.76.2 3switch1.openstreetmap:200109780002002c0000000001720002 +# Managed power strips + ++pdu1.openstreetmap:10.0.48.100 ++pdu2.openstreetmap:10.0.48.101 + # Bytemark machine, and the services which operate from it +shenron.openstreetmap:212.110.172.32 -- 2.39.5 From de4c628362a58bd3f6ea9152550029074dfcfd98 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 26 Jul 2018 15:22:49 +0100 Subject: [PATCH 03/16] Correct names for PDUs --- src/openstreetmap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openstreetmap b/src/openstreetmap index 88d5bcb..09bcdc5 100644 --- a/src/openstreetmap +++ b/src/openstreetmap @@ -332,8 +332,8 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org # Managed power strips -+pdu1.openstreetmap:10.0.48.100 -+pdu2.openstreetmap:10.0.48.101 ++pdu1.ams.openstreetmap:10.0.48.100 ++pdu2.ams.openstreetmap:10.0.48.101 # Bytemark machine, and the services which operate from it -- 2.39.5 From 128bbf3efdf8af6551816b60e2dc5c4914321ee5 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 26 Jul 2018 21:13:47 +0100 Subject: [PATCH 04/16] Switch nominatim back to dulcy --- src/openstreetmap | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openstreetmap b/src/openstreetmap index 09bcdc5..1526c3f 100644 --- a/src/openstreetmap +++ b/src/openstreetmap @@ -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 ++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 -- 2.39.5 From ad03216099b14f6b700a67c8f9d4fae7509a09a4 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 28 Jul 2018 09:51:16 +0100 Subject: [PATCH 05/16] Increase bandwidth to rhaegal --- src/render.openstreetmap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/render.openstreetmap b/src/render.openstreetmap index dddb80b..9562d06 100644 --- a/src/render.openstreetmap +++ b/src/render.openstreetmap @@ -47,7 +47,7 @@ rhaegal: statuscake: - 3343399 colour: "#a1b92e" - bandwidth: 50 + bandwidth: 100 ipv4: 161.53.248.77 default: "" -- 2.39.5 From fae66ba8b5fd743ebc15d0badaa1d02e02f0eb8b Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 28 Jul 2018 11:11:17 +0100 Subject: [PATCH 06/16] Add noomoahk to DNS --- src/openstreetmap | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/openstreetmap b/src/openstreetmap index 1526c3f..50ca20d 100644 --- a/src/openstreetmap +++ b/src/openstreetmap @@ -427,6 +427,8 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org 3ladon.openstreetmap:200106482ffe00040000000000000116 +komodo.openstreetmap:103.253.107.131 +ascalon.openstreetmap:184.107.48.228 ++noomoahk.openstreetmap:91.224.148.166 +3noomoahk.openstreetap:2a0372208080a6000000000000000001 # Blades -- 2.39.5 From e4a3e1c2aa4d42b0d88f89b5a91b6bb8169318e3 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 28 Jul 2018 14:10:19 +0100 Subject: [PATCH 07/16] Fix typo --- src/openstreetmap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openstreetmap b/src/openstreetmap index 50ca20d..18b8dfa 100644 --- a/src/openstreetmap +++ b/src/openstreetmap @@ -428,7 +428,7 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org +komodo.openstreetmap:103.253.107.131 +ascalon.openstreetmap:184.107.48.228 +noomoahk.openstreetmap:91.224.148.166 -3noomoahk.openstreetap:2a0372208080a6000000000000000001 +3noomoahk.openstreetmap:2a0372208080a6000000000000000001 # Blades -- 2.39.5 From 693f57f76e646ced0adef3bb7e819bc671597b92 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 28 Jul 2018 16:25:53 +0100 Subject: [PATCH 08/16] Create merge france cache node consisting of lyon and toulouse --- src/tile.openstreetmap | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/src/tile.openstreetmap b/src/tile.openstreetmap index fd1352a..7d51a9d 100644 --- a/src/tile.openstreetmap +++ b/src/tile.openstreetmap @@ -70,21 +70,29 @@ sanfrancisco: countries: - CN -# Lyon, FR -# BW Limit: 100Mb/s -lyon: - lat: 45.7575958 - lon: 4.8323239 - statuscake: - - 2217265 - - 2217266 +# Lyon/Toulouse, FR +# Lyon @ 45.7575958,4.8323239 with BW limit of 100Mb/s +# Toulouse @ 43.6044622,1.4442469 +france: + lat: 44.681029 + lon: 3.1382854 colour: "#bf6530" - bandwidth: 60 - ipv4: 77.95.65.39 - ipv6: 2a039180000001000000000000000007 - + servers: + - statuscake: + - 2217265 + - 2217266 + bandwidth: 40 + ipv4: 77.95.65.39 + ipv6: 2a039180000001000000000000000007 + - statuscake: + - x + - y + bandwidth: 40 + ipv4: 91.224.148.166 + ipv6: 2a0372208080a6000000000000000001 + # Falkenstein/Jena/Berlin, DE -# Falkenstain @ 50.47822,12.33607 +# Falkenstein @ 50.47822,12.33607 # Jena @ 50.9411,11.60085 # Berlin @ germany: -- 2.39.5 From c8b582284c99e7a9eec7934e13bb09b533702f60 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 28 Jul 2018 16:28:31 +0100 Subject: [PATCH 09/16] Tweak bandwidth for french cache --- src/tile.openstreetmap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tile.openstreetmap b/src/tile.openstreetmap index 7d51a9d..b263d34 100644 --- a/src/tile.openstreetmap +++ b/src/tile.openstreetmap @@ -81,13 +81,13 @@ france: - statuscake: - 2217265 - 2217266 - bandwidth: 40 + bandwidth: 45 ipv4: 77.95.65.39 ipv6: 2a039180000001000000000000000007 - statuscake: - x - y - bandwidth: 40 + bandwidth: 45 ipv4: 91.224.148.166 ipv6: 2a0372208080a6000000000000000001 -- 2.39.5 From 5c4caf4837e686f463130e5eef0585aa7b7ff70d Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 28 Jul 2018 16:32:30 +0100 Subject: [PATCH 10/16] Correct statuscake IDs for toulouse --- src/tile.openstreetmap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tile.openstreetmap b/src/tile.openstreetmap index b263d34..76f43dc 100644 --- a/src/tile.openstreetmap +++ b/src/tile.openstreetmap @@ -81,13 +81,13 @@ france: - statuscake: - 2217265 - 2217266 - bandwidth: 45 + bandwidth: 40 ipv4: 77.95.65.39 ipv6: 2a039180000001000000000000000007 - statuscake: - - x - - y - bandwidth: 45 + - 3351567 + - 3351569 + bandwidth: 40 ipv4: 91.224.148.166 ipv6: 2a0372208080a6000000000000000001 -- 2.39.5 From 232a523f7fdaba673ddb073d9b18bd1444ad4a32 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 30 Jul 2018 08:32:06 +0100 Subject: [PATCH 11/16] Increase bandwidth to rhaegal --- src/render.openstreetmap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/render.openstreetmap b/src/render.openstreetmap index 9562d06..469bdfc 100644 --- a/src/render.openstreetmap +++ b/src/render.openstreetmap @@ -47,7 +47,7 @@ rhaegal: statuscake: - 3343399 colour: "#a1b92e" - bandwidth: 100 + bandwidth: 200 ipv4: 161.53.248.77 default: "" -- 2.39.5 From 8fbaa2431240793b4f6f57def000c3917d1b8bfa Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Wed, 1 Aug 2018 16:26:59 +0100 Subject: [PATCH 12/16] Lower traffic to Corvallis / stormfly-02. --- src/tile.openstreetmap | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/tile.openstreetmap b/src/tile.openstreetmap index 76f43dc..104d9a4 100644 --- a/src/tile.openstreetmap +++ b/src/tile.openstreetmap @@ -214,13 +214,12 @@ corvallis: - 2217287 - 2217288 colour: "#a1285f" - bandwidth: 170 + bandwidth: 120 ipv4: 140.211.167.105 ipv6: 2605bc8030100700000000008cdea769 preferred: countries: - US - - MX # Budapest, HU budapest: -- 2.39.5 From 1cbf6d9c615e9c5119fcba98b601a6e548005c35 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Wed, 1 Aug 2018 16:30:25 +0100 Subject: [PATCH 13/16] Lower traffic again to Corvallis / stormfly-02. Drop MX --- src/tile.openstreetmap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tile.openstreetmap b/src/tile.openstreetmap index 104d9a4..c523c86 100644 --- a/src/tile.openstreetmap +++ b/src/tile.openstreetmap @@ -214,7 +214,7 @@ corvallis: - 2217287 - 2217288 colour: "#a1285f" - bandwidth: 120 + bandwidth: 110 ipv4: 140.211.167.105 ipv6: 2605bc8030100700000000008cdea769 preferred: -- 2.39.5 From 530bbcf76e0c981dc10883508b575e8e669cf8e5 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 1 Aug 2018 20:27:25 +0100 Subject: [PATCH 14/16] Increase bandwidth to rhaegal --- src/render.openstreetmap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/render.openstreetmap b/src/render.openstreetmap index 469bdfc..4df3180 100644 --- a/src/render.openstreetmap +++ b/src/render.openstreetmap @@ -47,7 +47,7 @@ rhaegal: statuscake: - 3343399 colour: "#a1b92e" - bandwidth: 200 + bandwidth: 300 ipv4: 161.53.248.77 default: "" -- 2.39.5 From 34d1d39758b67ff263962b384fadca804ef884bf Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 2 Aug 2018 15:45:03 +0100 Subject: [PATCH 15/16] Reduce bandwidth to viserion --- src/tile.openstreetmap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tile.openstreetmap b/src/tile.openstreetmap index c523c86..f46dcca 100644 --- a/src/tile.openstreetmap +++ b/src/tile.openstreetmap @@ -175,7 +175,7 @@ pula: - 2217279 - 2217280 colour: "#bf9430" - bandwidth: 120 + bandwidth: 90 ipv4: 193.198.233.211 ipv6: 20010b684cff00030000000000000003 default: "xx" -- 2.39.5 From 272980829a188d7cd193f52ba21dd60a7eebb24a Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Thu, 2 Aug 2018 15:55:29 +0100 Subject: [PATCH 16/16] Increase traffic to Corvallis tile cache --- src/tile.openstreetmap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tile.openstreetmap b/src/tile.openstreetmap index f46dcca..2c41eb3 100644 --- a/src/tile.openstreetmap +++ b/src/tile.openstreetmap @@ -214,7 +214,7 @@ corvallis: - 2217287 - 2217288 colour: "#a1285f" - bandwidth: 110 + bandwidth: 170 ipv4: 140.211.167.105 ipv6: 2605bc8030100700000000008cdea769 preferred: -- 2.39.5