diff --git a/doc/EN/mesh.org b/doc/EN/mesh.org index ba6b5dc4..9054839c 100644 --- a/doc/EN/mesh.org +++ b/doc/EN/mesh.org @@ -97,7 +97,7 @@ wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.x wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.xz.sig gpg --verify freedombone-meshclient-i386.img.xz.sig sha256sum freedombone-meshclient-i386.img.xz -f7e261d369d6f0ccf650dbbed18227bfe5ec427ae0b97f56e1f1e202afc6d0b3 +995dd64538f46f6abf83ba258cca6cb82a72399cb9a099caeafc1de947ef795c unxz freedombone-meshclient-i386.img.xz sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8 sudo dd bs=1M if=freedombone-meshclient-i386.img of=/dev/sdX conv=fdatasync @@ -113,7 +113,7 @@ wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i386.img.xz.sig gpg --verify freedombone-meshclient-insecure-i386.img.xz.sig sha256sum freedombone-meshclient-insecure-i386.img.xz -3bfbcaedb587c5cbddec8b9fffcd48398d9e3b97486ef49aa645357f61a0f11f +b06e6ff5e56577025e6b994fe0bb28f02da7d2905ac32a2f38d7d074ffe801fc unxz freedombone-meshclient-insecure-i386.img.xz sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8 sudo dd bs=1M if=freedombone-meshclient-insecure-i386.img of=/dev/sdX conv=fdatasync @@ -130,13 +130,13 @@ The above picture shows a Beaglebone Black with the image copied onto a microSD #+begin_src bash sudo apt-get install xz-utils wget -wget https://freedombone.net/downloads/v3/freedombone-mesh-3_beaglebone-armhf.img.xz -wget https://freedombone.net/downloads/v3/freedombone-mesh-3_beaglebone-armhf.img.xz.sig -gpg --verify freedombone-mesh-3_beaglebone-armhf.img.xz.sig -sha256sum freedombone-mesh-3_beaglebone-armhf.img.xz -ab783ea807da1144bd076f7b43e54b5f4376ecf1ea1f86f56ac76c3469325802 -unxz freedombone-mesh-3_beaglebone-armhf.img.xz -sudo dd bs=1M if=freedombone-mesh-3_beaglebone-armhf.img of=/dev/sdX conv=fdatasync +wget https://freedombone.net/downloads/current/freedombone-mesh_beaglebone-armhf.img.xz +wget https://freedombone.net/downloads/current/freedombone-mesh_beaglebone-armhf.img.xz.sig +gpg --verify freedombone-mesh_beaglebone-armhf.img.xz.sig +sha256sum freedombone-mesh_beaglebone-armhf.img.xz +45f131995e2f77188e7ddaf2b42ca3d8d48d821d37c7a31a21e2e6dcceaf510d +unxz freedombone-mesh_beaglebone-armhf.img.xz +sudo dd bs=1M if=freedombone-mesh_beaglebone-armhf.img of=/dev/sdX conv=fdatasync #+end_src If you have a few Beaglebone Blacks to use as routers then repeat the /dd/ command to create however many microSD cards you need. @@ -150,12 +150,12 @@ First you will need to create an image. On a Debian based system (tested on Debi #+begin_src bash sudo apt-get -y install git wget build-essential -wget https://freedombone.net/downloads/v3/freedombone-3.tar.gz -wget https://freedombone.net/downloads/freedombone-3.tar.gz.sig -gpg --verify freedombone-3.tar.gz.sig -sha256sum freedombone-3.tar.gz -b99853322871efd298a9efd78d22323e0e7424a5cdb5097b4cc55ef45a220ebb -tar -xzvf freedombone-3.tar.gz +wget https://freedombone.net/downloads/current/freedombone.tar.gz +wget https://freedombone.net/downloads/current/freedombone.tar.gz.sig +gpg --verify freedombone.tar.gz.sig +sha256sum freedombone.tar.gz +fd0b3fe1527de893f4ece7ffe95fdf0c41e635a3f82d22a51b707c1aee541e88 +tar -xzvf freedombone.tar.gz cd freedombone git checkout stretch sudo make install diff --git a/src/freedombone-app-scuttlebot b/src/freedombone-app-scuttlebot index 85e58e60..a64fed34 100755 --- a/src/freedombone-app-scuttlebot +++ b/src/freedombone-app-scuttlebot @@ -197,6 +197,10 @@ function remove_scuttlebot { } function mesh_install_scuttlebot { + if [[ $VARIANT == "mesh" ]]; then + return + fi + cat < $rootdir/usr/bin/install_scuttlebot #!/bin/bash npm install -g scuttlebot@${SCUTTLEBOT_VERSION} diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index 2d042cb0..2c8769e1 100755 --- a/src/freedombone-image-customise +++ b/src/freedombone-image-customise @@ -894,7 +894,7 @@ function configure_user_interface { # Produce a text file on the desktop listing users on the mesh cat < $rootdir/usr/bin/list-tox-users #!/bin/bash -ethernet_connected=$(cat /sys/class/net/eth0/carrier) +ethernet_connected=\$(cat /sys/class/net/eth0/carrier) users_list=\$(lstox | awk -F ' ' '{\$1=""; print \$0}' | sed -e 's/^[[:space:]]*//' | sort -d | uniq) if [ ! \$users_list ]; then no_of_users=0 @@ -1007,7 +1007,7 @@ if [ \$no_of_users -gt 0 ]; then # If ethernet is connected then add the invite icon to help enable # SSB nat traversal - if [[ "$ethernet_connected" != "0" ]]; then + if [[ "\$ethernet_connected" != "0" ]]; then if [ ! -f /home/$MY_USERNAME/Desktop/invite.desktop ]; then echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/invite.desktop echo 'Version=1.0' >> /home/$MY_USERNAME/Desktop/invite.desktop @@ -1018,6 +1018,7 @@ if [ \$no_of_users -gt 0 ]; then echo 'Icon=/usr/share/freedombone/avatars/invite.png' >> /home/$MY_USERNAME/Desktop/invite.desktop echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/invite.desktop echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/invite.desktop + chmod +x /home/$MY_USERNAME/Desktop/invite.desktop fi else if [ -f /home/$MY_USERNAME/Desktop/invite.desktop ]; then @@ -1054,7 +1055,7 @@ else fi # If there is no ethernet then remove the invite icon - if [[ "$ethernet_connected" == "0" ]]; then + if [[ "\$ethernet_connected" == "0" ]]; then if [ -f /home/$MY_USERNAME/Desktop/invite.desktop ]; then rm /home/$MY_USERNAME/Desktop/invite.desktop fi diff --git a/src/freedombone-utils-nodejs b/src/freedombone-utils-nodejs index e715ead9..37b23e2c 100755 --- a/src/freedombone-utils-nodejs +++ b/src/freedombone-utils-nodejs @@ -63,6 +63,9 @@ function get_npm_arch { function mesh_install_nodejs { mesh_install_nodejs_prefix= if [ $rootdir ]; then + if [[ $VARIANT == "mesh" ]]; then + return + fi mesh_install_nodejs_prefix="chroot $rootdir" fi $mesh_install_nodejs_prefix apt-get -yq install g++ m4 libtool automake nodejs curl diff --git a/website/EN/mesh.html b/website/EN/mesh.html index 11b45cae..398838df 100644 --- a/website/EN/mesh.html +++ b/website/EN/mesh.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + ‎ @@ -274,13 +274,13 @@ for the JavaScript code in this tag. -What the system can do +What the system can do - -Disk Images +Disk Images - -Building Disk Images +Building Disk Images - -How to use it +How to use it @@ -324,9 +324,9 @@ The Freedombone mesh roughly follows MondoNet's ten social specifications:
  • Evolvable: The network should be built with future development in mind. The platform should be flexible enough to support technologies, protocols and modes of usage that have not yet been developed.
    • -
    -

    What the system can do

    -
    +
    +

    What the system can do

    +
    • Discovery of other users on the network
    • Text based chat, one-to-one and in groups
      • @@ -350,13 +350,13 @@ This system should be quite scalable. Both qTox and IPFS are based upon distribu
    -
    -

    Disk Images

    -
    +
    +

    Disk Images

    +
    -
    -

    Writing many images quickly

    -
    +
    +

    Writing many images quickly

    +

    There may be situations where you need to write the same disk image to multiple drives at the same time in order to maximize rate of deployment. In the instructions given below the dd command is used for writing to the target drive, but to write to multiple drives you can use a tool such as GNOME MultiWriter.

    @@ -384,9 +384,9 @@ The MultiWriter tool is also available within mesh client images, so that you ca

    -
    -

    Client images

    -
    +
    +

    Client images

    +
    @@ -405,7 +405,7 @@ wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.x wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.xz.sig gpg --verify freedombone-meshclient-i386.img.xz.sig sha256sum freedombone-meshclient-i386.img.xz -f7e261d369d6f0ccf650dbbed18227bfe5ec427ae0b97f56e1f1e202afc6d0b3 +995dd64538f46f6abf83ba258cca6cb82a72399cb9a099caeafc1de947ef795c unxz freedombone-meshclient-i386.img.xz sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8 sudo dd bs=1M if=freedombone-meshclient-i386.img of=/dev/sdX conv=fdatasync @@ -426,7 +426,7 @@ wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i386.img.xz.sig gpg --verify freedombone-meshclient-insecure-i386.img.xz.sig sha256sum freedombone-meshclient-insecure-i386.img.xz -3bfbcaedb587c5cbddec8b9fffcd48398d9e3b97486ef49aa645357f61a0f11f +b06e6ff5e56577025e6b994fe0bb28f02da7d2905ac32a2f38d7d074ffe801fc unxz freedombone-meshclient-insecure-i386.img.xz sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8 sudo dd bs=1M if=freedombone-meshclient-insecure-i386.img of=/dev/sdX conv=fdatasync @@ -435,16 +435,16 @@ sudo dd bs=1M -

    Router images

    -
    +
    +

    Router images

    +

    Routers are intended to build network coverage for an area using small and low cost hardware. You can bolt them to walls or leave them on window ledges. They don't have any user interface and their only job is to haul network traffic across the mesh and to enable peers to find each other via running bootstrap nodes for Tox and IPFS. Copy the image to a microSD card and insert it into the router, plug in an Atheros wifi dongle and power on. That should be all you need to do.

    -
    -

    Beaglebone Black

    -
    +
    +

    Beaglebone Black

    +
    @@ -459,13 +459,13 @@ The above picture shows a Beaglebone Black with the image copied onto a microSD 
    sudo apt-get install xz-utils wget
-wget https://freedombone.net/downloads/v3/freedombone-mesh-3_beaglebone-armhf.img.xz
-wget https://freedombone.net/downloads/v3/freedombone-mesh-3_beaglebone-armhf.img.xz.sig
-gpg --verify freedombone-mesh-3_beaglebone-armhf.img.xz.sig
-sha256sum freedombone-mesh-3_beaglebone-armhf.img.xz
-ab783ea807da1144bd076f7b43e54b5f4376ecf1ea1f86f56ac76c3469325802
-unxz freedombone-mesh-3_beaglebone-armhf.img.xz
-sudo dd bs=1M if=freedombone-mesh-3_beaglebone-armhf.img of=/dev/sdX conv=fdatasync
+wget https://freedombone.net/downloads/current/freedombone-mesh_beaglebone-armhf.img.xz
+wget https://freedombone.net/downloads/current/freedombone-mesh_beaglebone-armhf.img.xz.sig
+gpg --verify freedombone-mesh_beaglebone-armhf.img.xz.sig
+sha256sum freedombone-mesh_beaglebone-armhf.img.xz
+45f131995e2f77188e7ddaf2b42ca3d8d48d821d37c7a31a21e2e6dcceaf510d
+unxz freedombone-mesh_beaglebone-armhf.img.xz
+sudo dd bs=1M if=freedombone-mesh_beaglebone-armhf.img of=/dev/sdX conv=fdatasync
    @@ -481,9 +481,9 @@ There is still a software freedom issue with the Beaglebone Black, but it doesn'
    -
    -

    Building Disk Images

    -
    +
    +

    Building Disk Images

    +

    It's better not to trust images downloaded from random places on the interwebs. Chances are that unless you are in the web of trust of the above GPG signatures then they don't mean very much to you. If you actually want something trustworthy then build the images from scratch. It will take some time. Here's how to do it.

    @@ -494,12 +494,12 @@ First you will need to create an image. On a Debian based system (tested on Debi 
    sudo apt-get -y install git wget build-essential
-wget https://freedombone.net/downloads/v3/freedombone-3.tar.gz
-wget https://freedombone.net/downloads/freedombone-3.tar.gz.sig
-gpg --verify freedombone-3.tar.gz.sig
-sha256sum freedombone-3.tar.gz
-b99853322871efd298a9efd78d22323e0e7424a5cdb5097b4cc55ef45a220ebb
-tar -xzvf freedombone-3.tar.gz
+wget https://freedombone.net/downloads/current/freedombone.tar.gz
+wget https://freedombone.net/downloads/current/freedombone.tar.gz.sig
+gpg --verify freedombone.tar.gz.sig
+sha256sum freedombone.tar.gz
+fd0b3fe1527de893f4ece7ffe95fdf0c41e635a3f82d22a51b707c1aee541e88
+tar -xzvf freedombone.tar.gz
 cd freedombone
 git checkout stretch
 sudo make install
@@ -571,9 +571,9 @@ The resulting image can be copied to a microSD card, inserted into a Beaglebone
    -
    -

    Customisation

    -
    +
    +

    Customisation

    +

    If you want to make your own specially branded version, such as for a particular event, then to change the default desktop backgrounds edit the images within img/backgrounds and to change the available avatars and desktop icons edit the images within img/avatars. Re-create disk images using the instructions shown previously.

    @@ -583,9 +583,9 @@ If you need particular dconf commands to alter desktop appearance or beha

    -
    -

    How to use it

    -
    +
    +

    How to use it

    +

    When you first boot from the USB drive the system will create some encryption keys, assign a unique network address to the system and then reboot itself. When that's done you should see a prompt asking for a username. This username just makes it easy for others to initially find you on the mesh and will appear in the list of users.

    @@ -595,9 +595,9 @@ After a minute or two if you are within wifi range and there is at least one oth

    -
    -

    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.

    @@ -607,9 +607,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.

    @@ -619,9 +619,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.

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

    Connecting to the internet

    -
    +
    +

    Connecting to the internet

    +

    If you need to be able to access the internet from the mesh then connect one of the peers to an internet router using an ethernet cable, then reboot it. Other peers in the mesh, including any attached mobile devices, will then be able to access the internet using the ethernet attached peer as a gateway. Freifunk works in a similar way.

    @@ -669,9 +669,9 @@ 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

    +

    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. VPN configuration, pem and stunnel files exist within the home directory. Edit the configuration with:

    @@ -707,9 +707,9 @@ Using the password "freedombone". From a deep packet inspection point of
    -
    -

    Mobile devices (phones, etc)

    -
    +
    +

    Mobile devices (phones, etc)

    +

    To allow mobile devices to connect to the mesh you will need a second wifi adapter connected to your laptop/netbook/SBC. Plug in a second wifi adapter then reboot the system. The second adaptor will then create a wifi hotspot which mobile devices can connect to. The hotspot name also contains its local IP address (eg. "mesh-192.168.1.83").

    @@ -731,9 +731,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.

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

    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.

    @@ -829,9 +829,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.

    @@ -846,9 +846,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.