diff --git a/doc/EN/mesh_usage.org b/doc/EN/mesh_usage.org index a828a32e..826c7f09 100644 --- a/doc/EN/mesh_usage.org +++ b/doc/EN/mesh_usage.org @@ -67,6 +67,11 @@ sudo openvpn myclient.ovpn Where /myclient.ovpn/ comes from your VPN provider and with the password "/freedombone/". * Connecting two meshes over the internet via a VPN tunnel + +#+BEGIN_CENTER +[[file:images/mesh_architecture_vpn.jpg]] +#+END_CENTER + Maybe the internet exists, but you don't care about getting any content from it and just want to use it as a way to connect mesh networks from different geographical locations together. In your home directory on a system connected via ethernet to an internet router you'll find a file called *vpn.tar.gz*. If you want another mesh to be able to connect to yours then send them this file and get them to uncompress it into their home directory also on an internet gateway machine. If they have an external IP address or domain name for your router then they will be able to VPN connect using the *Connect Meshes* icon. They should also forward port 653 from their internet router to the mesh gateway machine. diff --git a/img/mesh_architecture1.jpg b/img/mesh_architecture1.jpg index 0908c044..2bb43e32 100644 Binary files a/img/mesh_architecture1.jpg and b/img/mesh_architecture1.jpg differ diff --git a/img/mesh_architecture2.jpg b/img/mesh_architecture2.jpg index b7875a70..dcd27aa7 100644 Binary files a/img/mesh_architecture2.jpg and b/img/mesh_architecture2.jpg differ diff --git a/img/mesh_architecture3.jpg b/img/mesh_architecture3.jpg index 35a7c966..4b06ef59 100644 Binary files a/img/mesh_architecture3.jpg and b/img/mesh_architecture3.jpg differ diff --git a/img/mesh_architecture_vpn.jpg b/img/mesh_architecture_vpn.jpg new file mode 100644 index 00000000..3bc4b59b Binary files /dev/null and b/img/mesh_architecture_vpn.jpg differ diff --git a/website/EN/mesh_usage.html b/website/EN/mesh_usage.html index 3db2f2b0..a61a0621 100644 --- a/website/EN/mesh_usage.html +++ b/website/EN/mesh_usage.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + ‎ @@ -247,17 +247,17 @@ for the JavaScript code in this tag.

Mesh Network: How to use it

@@ -268,9 +268,9 @@ When you first boot from the USB drive the system will create some encryption ke After a minute or two if you are within wifi range and there is at least one other user on the network then you should see additional icons appear on the desktop, such as Other Users and Chat.

-
-

Boot trouble

-
+
+

Boot trouble

+

If the system doesn't boot and reports an error which includes /dev/mapper/loop0p1 then reboot with Ctrl-Alt-Del and when you see the grub menu press e and manually change /dev/mapper/loop0p1 to /dev/sdb1, then press Ctrl-x. If that doesn't work then reboot and try /dev/sdc1 instead.

@@ -280,9 +280,9 @@ After the system has booted successfully the problem should resolve itself on su

-
-

Set the Date

-
+
+

Set the Date

+

On the ordinary internet the date and time of your system would be set automatically via NTP. But this is not the internet and so you will need to manually ensure that your date and time settings are correct. You might need to periodically do this if your clock drifts. It's not essential that the time on your system be highly accurate, but if it drifts too far or goes back to epoch then things could become a little confusing in regard to the order of blog posts.

@@ -292,9 +292,9 @@ On the ordinary internet the date and time of your system would be set automatic

-
-

Check network status

-
+
+

Check network status

+

Unlike with ordinary wifi, on the mesh you don't get a signal strength icon and so it's not simple to see if you have a good connection.

@@ -317,9 +317,9 @@ When you are finished close the window and then select the Network Restart
-
-

Connecting to the internet

-
+
+

Connecting to the internet

+
@@ -350,9 +350,17 @@ Where myclient.ovpn comes from your VPN provider and with the password "<

-
-

Connecting two meshes over the internet via a VPN tunnel

-
+
+

Connecting two meshes over the internet via a VPN tunnel

+
+
+ +
+

mesh_architecture_vpn.jpg +

+
+
+

Maybe the internet exists, but you don't care about getting any content from it and just want to use it as a way to connect mesh networks from different geographical locations together.

@@ -379,9 +387,9 @@ From a deep packet inspection point of view the traffic going over the internet
-
-

Mobile devices (phones, etc)

-
+
+

Mobile devices (phones, etc)

+
@@ -411,9 +419,9 @@ On some android devices you may need to move the downloaded APK file from the
-
-

Chat System

-
+
+

Chat System

+

Ensure that you're within wifi range of at least one other mesh peer (could be a router or client) and then you should see that the Chat and Other Users icons appear. Select the users icon and you should see a list of users on the mesh. Select the Chat icon and once you are connected you should see the status light turn green. If after a few minutes you don't get the green status light then try closing and re-opening the Tox chat application. Select the plus button to add a friend and then copy and paste in a Tox ID from the users list.

@@ -472,9 +480,9 @@ At present video doesn't work reliably, but text and voice chat do work well.
-
-

Collaborative document editing

-
+
+

Collaborative document editing

+

The mesh system includes the ability to collaboratively edit various sorts of documents using CryptPad. CryptPad is an almost peer-to-peer system in that it is designed for a client/server environment but that the server aspect of it is very minimal and limited to orchestrating the connected clients. With CryptPad installed on each mesh peer it effectively enables peer-to-peer collaborative editing. Documents are ephemeral and forgotten unless they're exported or copy-pasted to permanent storage.

@@ -505,9 +513,9 @@ If you have the chat system running you can then copy and paste the URL for your
-
-

Social Network

-
+
+

Social Network

+

Patchwork is available as a social networking system for the mesh. Like all social network systems it has a stream of posts and you can follow or unfollow other users. You can also send private messages to other users with end-to-end encryption.

@@ -542,9 +550,9 @@ The Secure Scuttlebutt protocol which Patchwork is based upon is intended to be
-
-

Sharing Files

-
+
+

Sharing Files

+

You can make files publicly available on the network simply by dragging and dropping them into the Public folder on the desktop. To view the files belonging to another user select the desktop icon called Visit a site and enter the username or Tox ID of the other user.

@@ -559,9 +567,9 @@ You can make files publicly available on the network simply by dragging and drop
-
-

Blogging

-
+
+

Blogging

+

To create a blog post select the Blog icon on the desktop and then use the up and down cursor keys, space bar and enter key to add a new entry. Edit the title of the entry and add your text. You can also include photos if you wish - just copy them to the CreateBlog/content/images directory and then link to them as shown.