diff --git a/geofeed.csv b/geofeed.csv index 164281e..c645d34 100644 --- a/geofeed.csv +++ b/geofeed.csv @@ -1,4 +1,4 @@ fdfe:8d0:7450:100::/56,NL,,Amsterdam, -fdfe:8d0:7450:200::/56,DE,,Nuremberg, +fdfe:8d0:7450:200::/56,DE,,Frankfurt, fdfe:8d0:7450:300::/56,PL,,Warsaw, fdfe:8d0:7450:400::/56,FR,,Paris, \ No newline at end of file diff --git a/nodes.md b/nodes.md index 57752d7..0bd6d24 100644 --- a/nodes.md +++ b/nodes.md @@ -13,9 +13,9 @@ Prefix hostname with `ipv4.` to force IPv4 \ - Pingable: `fdfe:8d0:7450:100::` - Hosting: [Scaleway](https://www.scaleway.com/en/) -### Nuremberg, Germany +### Frankfurt, Germany - `de1.420129.xyz` 1 Gbps (v6 + v4) -- Tunnelled to Frankfurt, +4ms. Planned move to Frankfurt +- Tunnelled from Nuremberg, +4ms. Planned move to Frankfurt - Public key: `N9rGceoiFcc/obnHrqMAmVlrb/E2Br55+doekTKwNF8=` - Link local: `fe80::129:2` - Pingable: `fdfe:8d0:7450:200::` diff --git a/src/index.html b/src/index.html index 254f27a..deff38a 100644 --- a/src/index.html +++ b/src/index.html @@ -20,7 +20,7 @@

Open for peering in:

diff --git a/src/map/map.js b/src/map/map.js index 78b4f09..b43b624 100644 --- a/src/map/map.js +++ b/src/map/map.js @@ -36,11 +36,11 @@ var nodes = { }, de1: { country: 'de', - location: [49.44951340282083, 11.014075123186862], - city: "Nuremberg, Germany", + location: [50.1097998, 8.7428039], + city: "Frankfurt, Germany", hostname: "de1.420129.xyz", - datacenter: "hetzner nbg", - description: `Tunneled to Frankfurt.\nIf you have a node here at hetzner nuremberg, it will go nbg -> fra -> nbg.`, + datacenter: "maincubes FRA-01", + description: `Tunneled from hetzner nbg\nIf you have a node here at hetzner nuremberg, it will go nbg -> fra -> nbg.`, publicKey: "N9rGceoiFcc/obnHrqMAmVlrb/E2Br55+doekTKwNF8=", linkLocal: "fe80::129:2" }, @@ -50,7 +50,7 @@ var nodes = { city: "Amsterdam, Netherlands", hostname: "nl1.420129.xyz", datacenter: "scaleway AMS-1", - description: `I don't know where exactly`, + description: ``, publicKey: "iZfLBtF6BiQvdKXx4Yl02u+OL6ls35gSpWCRmB9q4lU=", linkLocal: "fe80::129:1" }, @@ -60,7 +60,7 @@ var nodes = { city: "Paris, France", hostname: "fr1.420129.xyz", datacenter: "scaleway PAR 1", - description: `I don't know where exactly`, + description: ``, publicKey: "uT+GQ291rjmK9/lBStKfcUdstf2PAcvoQfbdJYRc7A0=", linkLocal: "fe80::129:4" } @@ -166,11 +166,9 @@ for (let node of Object.values(nodes)) { nodesElement.appendChild(ele); } -line(nodes.de1.location, de1t, "Tunnel (already included in other labels)
4ms"); -line(de1t, nodes.pl1.location, "de1 - pl1
24ms"); -line(de1t, nodes.nl1.location, "de1 - nl1
10ms"); +line(nodes.de1.location, nodes.pl1.location, "de1 - pl1
24ms"); +line(nodes.de1.location, nodes.nl1.location, "de1 - nl1
10ms"); line(nodes.nl1.location, nodes.pl1.location, "pl1 - nl1
23ms"); - line(nodes.nl1.location, nodes.fr1.location, "fr1 - nl1
10ms"); /*map.on("dragstart", function () {