tfgrid/info_tfgrid
33
3
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Activity

Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid

Browse Source 
# Conflicts:
#	books/projectinca/SUMMARY.md
#	collections/tech/primitives/network/mycelium.md
This commit is contained in:
kristof de spiegeleer
2024-05-09 17:11:35 +03:00
parent 2eed0b65b7 ba303b6e3e
commit 948d6c0de2
108 changed files with 734 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
collections/tech/primitives/network/mycelium.md
View File

@@ -1,8 +1,18 @@
<<<<<<< HEAD
# Mycelium: Our Planetary Network as used in the TFGrid
![alt text](img/mycelium.png)
=======
# Mycelium: Our Planetary Network
The planetary network called Mycelium is an overlay network which lives on top of the existing Internet or other peer-to-peer networks created.
![](img/planet_net_.jpg)
In the Mycelium network, everyone is connected to everyone. End-to-end encryption between users of an app and the app runs behind the network wall.
>>>>>>> ba303b6e3eb8220bf2851a949db109e68ccd1f8c
!!wiki.include page:'tech:mycelium_incl.md'

2
collections/tech/primitives/network/networking.md
View File

@@ -13,7 +13,7 @@ No connection is made with the Internet. The ZNet is a single tenant network and
### Redundancy
As integrated with [Web Gateway (WebGW)](webgw):
As integrated with [Web Gateway](webgw.md)
![alt text](net2.png)