From 6b20cce94feee1b6372023f63c76283f5f105aba Mon Sep 17 00:00:00 2001 From: Mik-TF Date: Tue, 14 May 2024 15:12:18 -0400 Subject: [PATCH] manual update mycelium --- collections/dashboard/deploy/deploy.md | 2 +- .../{ => img}/solutions_staticwebsite.png | Bin .../{ => img}/staticwebsite_list.png | Bin .../grid_deployment/deploy_dashboard.md | 8 ++-- .../mycelium/information.md | 36 ++++++++++++------ 5 files changed, 30 insertions(+), 16 deletions(-) rename collections/dashboard/solutions/{ => img}/solutions_staticwebsite.png (100%) rename collections/dashboard/solutions/{ => img}/staticwebsite_list.png (100%) diff --git a/collections/dashboard/deploy/deploy.md b/collections/dashboard/deploy/deploy.md index 2b358a3..2a66a64 100644 --- a/collections/dashboard/deploy/deploy.md +++ b/collections/dashboard/deploy/deploy.md @@ -4,7 +4,7 @@ Here you will find everything related to deployments on the ThreeFold grid. This - Checking the cost of a deployment using [Pricing Calculator](pricing_calculator.md) - Finding a node to deploy on using the [Node Finder](node_finder.md) -- Deploying your desired workload from [Virtual Machines](vm_intro.md), [Orchestrators](orchestrators.md), or [Applictions](applications.md) +- Deploying your desired workload from [Virtual Machines](vm_intro.md), [Orchestrators](orchestrators.md), or [Applications](applications.md) - Renting your own node on the ThreeFold grid from [Dedicated Machines](dedicated_machines.md) - Consulting [Your Contracts](your_contracts.md) on the TFGrid - Finding or publishing Flists from [Images](images.md) diff --git a/collections/dashboard/solutions/solutions_staticwebsite.png b/collections/dashboard/solutions/img/solutions_staticwebsite.png similarity index 100% rename from collections/dashboard/solutions/solutions_staticwebsite.png rename to collections/dashboard/solutions/img/solutions_staticwebsite.png diff --git a/collections/dashboard/solutions/staticwebsite_list.png b/collections/dashboard/solutions/img/staticwebsite_list.png similarity index 100% rename from collections/dashboard/solutions/staticwebsite_list.png rename to collections/dashboard/solutions/img/staticwebsite_list.png diff --git a/collections/developers/grid_deployment/deploy_dashboard.md b/collections/developers/grid_deployment/deploy_dashboard.md index b126b8b..6c85532 100644 --- a/collections/developers/grid_deployment/deploy_dashboard.md +++ b/collections/developers/grid_deployment/deploy_dashboard.md @@ -23,10 +23,10 @@ We also show how to provide a public access to the Dashboard by setting a gatewa ## Prerequisites - TFChain account with TFT -- [Deploy full VM with WireGuard connection](../../system_administrators/getstarted/ssh_guide/ssh_wireguard.md) -- [Make sure you can connect via SSH on the terminal](../../system_administrators/getstarted/ssh_guide/ssh_openssh.md) +- [Deploy full VM with WireGuard connection](system_administrators@@ssh_wireguard) +- [Make sure you can connect via SSH on the terminal](system_administrators@@ssh_openssh) -In this guide, we use WireGuard, but you can use other connection methods, such as [Mycelium](../../system_administrators/mycelium/mycelium_toc.md). +In this guide, we use WireGuard, but you can use other connection methods, such as [Mycelium](system_administrators@@mycelium_toc). ## Create an SSH Tunnel @@ -106,7 +106,7 @@ To stop running the Dashboard, simply enter ̀`Ctrl-C` on the terminal window. Once you've tested the Dashboard with the SSH tunnel, you can explore how to access it from the public Internet. For this, we will create a gateway domain and bind the host to `0.0.0.0`. -On the Full VM page, [add a domain](../../dashboard/solutions/add_domain.md) to access your deployment from the public Internet. +On the Full VM page, [add a domain](dashboard@@add_domain) to access your deployment from the public Internet. - Under `Actions`, click on `Manage Domains` - Go to `Add New Domain` diff --git a/collections/system_administrators/mycelium/information.md b/collections/system_administrators/mycelium/information.md index 890c0db..a9eee41 100644 --- a/collections/system_administrators/mycelium/information.md +++ b/collections/system_administrators/mycelium/information.md @@ -5,7 +5,7 @@ - [Introduction](#introduction) - [Connect to Other Nodes](#connect-to-other-nodes) -- [Possible Peers](#possible-peers) +- [Hosted Public Nodes](#hosted-public-nodes) - [Default Port](#default-port) - [Check Network Information](#check-network-information) - [Test the Network](#test-the-network) @@ -36,18 +36,32 @@ If you are using other tun inferface, e.g. utun3 (default), you can set a differ mycelium --peers tcp://83.231.240.31:9651 quic://185.206.122.71:9651 --tun-name utun9 ``` -## Possible Peers +## Hosted Public Nodes -Here are some possible peers. +A couple of public nodes are provided, which can be freely connected to. This allows +anyone to join the global network. These are hosted in 3 geographic regions, on both +IPv4 and IPv6, and supporting both the Tcp and Quic protocols. The nodes are the +following: -``` -tcp://146.185.93.83:9651 -quic://83.231.240.31:9651 -quic://185.206.122.71:9651 -tcp://[2a04:f340:c0:71:28cc:b2ff:fe63:dd1c]:9651 -tcp://[2001:728:1000:402:78d3:cdff:fe63:e07e]:9651 -quic://[2a10:b600:1:0:ec4:7aff:fe30:8235]:9651 -``` +| Node ID | Region | IPv4 | IPv6 | Tcp port | Quic port | +| --- | --- | --- | --- | --- | --- | +| 01 | DE | 188.40.132.242 | 2a01:4f8:221:1e0b::2 | 9651 | 9651 | +| 02 | DE | 136.243.47.186 | 2a01:4f8:212:fa6::2 | 9651 | 9651 | +| 03 | BE | 185.69.166.7 | 2a02:1802:5e:0:8478:51ff:fee2:3331 | 9651 | 9651 | +| 04 | BE | 185.69.166.8 | 2a02:1802:5e:0:8c9e:7dff:fec9:f0d2 | 9651 | 9651 | +| 05 | FI | 65.21.231.58 | 2a01:4f9:6a:1dc5::2 | 9651 | 9651 | +| 06 | FI | 65.109.18.113 | 2a01:4f9:5a:1042::2 | 9651 | 9651 | + +These nodes are all interconnected, so 2 peers who each connect to a different node +(or set of disjoint nodes) will still be able to reach each other. For optimal performance, +it is recommended to connect to all of the above at once however. An example connection +string could be: + +`--peers tcp://188.40.132.242:9651 "tcp://[2a01:4f8:212:fa6::2]:9651" quic://185.69.166.7:9651 "tcp://[2a02:1802:5e:0:8c9e:7dff:fec9:f0d2]:9651" tcp://65.21.231.58:9651 "quic://[2a01:4f9:5a:1042::2]:9651"` + +It is up to the user to decide which peers he wants to use, over which protocol. +Note that quotation may or may not be required, depending on which shell is being +used. ## Default Port