diff --git a/nodes.md b/nodes.md
index 012c122..2c3b74c 100644
--- a/nodes.md
+++ b/nodes.md
@@ -10,34 +10,38 @@ Prefix hostname with `ipv4.` to force IPv4 \
- `nl1.420129.xyz` 500 Mbps (v6 + v4)
- Public key: `iZfLBtF6BiQvdKXx4Yl02u+OL6ls35gSpWCRmB9q4lU=`
- Link local: `fe80::129:1`
-- Pingable: `fdfe:8d0:7450:100::`
-- Hosting: Oracle Cloud
+- Pingable: `fdfe:8d0:7450:100::1`
-### Frankfurt, Germany
+### Nuremberg, Germany
- `de1.420129.xyz` 1 Gbps (v6 + v4)
-- Tunnelled from Nuremberg, +4ms. Planned move to Frankfurt
+- **Tunneled to Frankfurt, so +4ms to everywhere. Double that to Nuremberg itself.**
- Public key: `N9rGceoiFcc/obnHrqMAmVlrb/E2Br55+doekTKwNF8=`
- Link local: `fe80::129:2`
-- Pingable: `fdfe:8d0:7450:200::`
-- Hosting: [Advin Servers](https://clients.advinservers.com/aff.php?aff=323)
+- Pingable: `fdfe:8d0:7450:200::1`
+- Provider: [Advin Servers](https://clients.advinservers.com/aff.php?aff=323)
### Warsaw, Poland
- `pl1.420129.xyz` 1 Gbps (v6 + v4)
-- Public key: `v854+5m4Diqh8oGo6/sGVS7LELsreIjMujkWqwc6bWo=`
+- Public key: `m724+hK4uwk76P8b6gxGocYzwkQ7P7el0ZIV4SxoKG0=`
- Link local: `fe80::129:3`
-- Pingable: `fdfe:8d0:7450:300::`
-- Hosting: [Skhron](https://skhron.com.ua/aff.php?aff=23)
+- Pingable: `fdfe:8d0:7450:300::1`
+- Provider: [Skhron](https://skhron.com.ua/aff.php?aff=23)
### Paris, France
- `fr1.420129.xyz` 100 Mbps (v6)
- Public key: `uT+GQ291rjmK9/lBStKfcUdstf2PAcvoQfbdJYRc7A0=`
- Link local: `fe80::129:4`
- Pingable: `fdfe:8d0:7450:400::`
-- Hosting: [Scaleway](https://www.scaleway.com/en/)
### Stockholm, Sweden
- `se1.420129.xyz` 100 Mbps (v6 + v4)
-- Public key: `tS6j+/aroaMYT/mbzv4xDGI7bc6/LAgwc/KKrw/LIVI=`
+- Public key: `m724+na8merDXnOAWbFDJPhzyujDekX8vR5Ibgt4oyY=`
- Link local: `fe80::129:5`
-- Pingable: `fdfe:8d0:7450:500::`
-- Hosting: [No Ack Hosting](https://noackhosting.se)
+- Pingable: `fdfe:8d0:7450:500::1`
+- Provider: [No Ack Hosting](https://order.noackhosting.se/?affid=1)
+
+### Frankfurt, Germany
+- `de2.420129.xyz` 100 Mbps (v6 + v4)
+- Public key: `VJMKJEuteSa9izj5f+bUD8bhQL99NnITnxyy0+1Gblw=`
+- Link local: `fe80::129:7`
+- Pingable: `fdfe:8d0:7450:700::1`
diff --git a/src/map/map.js b/src/map/map.js
index 8f3e95f..aebd18e 100644
--- a/src/map/map.js
+++ b/src/map/map.js
@@ -25,19 +25,15 @@ var nodes = {
city: "Warsaw, Poland",
hostname: "pl1.420129.xyz",
datacenter: "equinix wa3",
- description: ``,
- publicKey: "v854+5m4Diqh8oGo6/sGVS7LELsreIjMujkWqwc6bWo=",
- linkLocal: "fe80::129:3"
+ description: ``
},
de1: {
country: 'de',
- location: [50.1097998, 8.7428039],
- city: "Frankfurt, Germany",
+ location: [49.4494496, 11.0140529],
+ city: "Nuremberg, Germany",
hostname: "de1.420129.xyz",
- 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"
+ datacenter: "Hetzner",
+ description: `Tunneled to Frankfurt, +4ms everywhere.`
},
nl1: {
country: 'nl',
@@ -45,9 +41,7 @@ var nodes = {
city: "Amsterdam, Netherlands",
hostname: "nl1.420129.xyz",
datacenter: "Netherlands Northwest eu-amsterdam-1",
- description: ``,
- publicKey: "iZfLBtF6BiQvdKXx4Yl02u+OL6ls35gSpWCRmB9q4lU=",
- linkLocal: "fe80::129:1"
+ description: ``
},
fr1: {
country: 'fr',
@@ -55,9 +49,7 @@ var nodes = {
city: "Paris, France",
hostname: "fr1.420129.xyz",
datacenter: "scaleway PAR 1",
- description: ``,
- publicKey: "uT+GQ291rjmK9/lBStKfcUdstf2PAcvoQfbdJYRc7A0=",
- linkLocal: "fe80::129:4"
+ description: ``
},
se1: {
country: 'se',
@@ -65,9 +57,15 @@ var nodes = {
city: "Stockholm, Sweden",
hostname: "fr1.420129.xyz",
datacenter: "unknown",
- description: ``,
- publicKey: "tS6j+/aroaMYT/mbzv4xDGI7bc6/LAgwc/KKrw/LIVI=",
- linkLocal: "fe80::129:5"
+ description: ``
+ },
+ de2: {
+ country: 'de',
+ location: [50.0968987, 8.6441317],
+ city: "Frankfurt, Germany",
+ hostname: "de2.420129.xyz",
+ datacenter: "Equinix FR7",
+ description: ``
},
}
@@ -171,13 +169,13 @@ for (let node of Object.values(nodes)) {
nodesElement.appendChild(ele);
}
-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");
+line(nodes.nl1.location, nodes.se1.location, "nl1 - se1
20ms");
+line(nodes.nl1.location, nodes.de1.location, "nl1 - de1
10ms");
+line(nodes.nl1.location, nodes.fr1.location, "nl1 - fr1
10ms");
+line(nodes.nl1.location, nodes.de2.location, "nl1 - de2
7ms");
-line(nodes.nl1.location, nodes.se1.location, "fr1 - se1
20ms");
-line(nodes.de1.location, nodes.se1.location, "de1 - se1
27ms");
+line(nodes.de1.location, nodes.de2.location, "de2 - de1
5ms");
+line(nodes.de2.location, nodes.pl1.location, "de2 - pl1
24ms");
/*map.on("dragstart", function () {
dismissPopup(false);