Merge branch 'stretch' of https://github.com/bashrc/freedombone

doc/EN/mesh.org

@@ -33,12 +33,13 @@ Mesh networks are useful as a quick way to make a fully decentralised communicat
  - Voice chat (VoIP)
  - Private and public sharing of files
  - Blogging
+ - Social network stream. Follow/unfollow other peers
  - No network administration required
- - No servers, internet connection or cabling is needed.
- - Works from bootable USB drives or microSD drives.
+ - No servers, internet connection or cabling is needed
+ - Works from bootable USB drives or microSD drives
  - Data is mesh routed between systems
- - Private communications is end-to-end secured and forward secret.
- - Publicly shared data is /content addressable/.
+ - Private communications is end-to-end secured and forward secret
+ - Publicly shared data is /content addressable/
 
 This system should be quite scalable. Both qTox and IPFS are based upon distributed hash tables (DHT) so that each peer does not need to store the full index of data for the entire network. Caching or pinning of IPFS data and its content addressability means that if a file or blog becomes popular then performance should improve as the number of downloads increases, which is the opposite of the client/server paradigm.
 
@@ -67,14 +68,14 @@ sudo apt-get install gnome-multi-writer
 
 #+begin_src bash
 sudo apt-get install xz-utils wget
-wget https://freedombone.net/downloads/v3/freedombone-meshclient-3_all-i386.img.xz
-wget https://freedombone.net/downloads/v3/freedombone-meshclient-3_all-i386.img.xz.sig
-gpg --verify freedombone-meshclient-3_all-i386.img.xz.sig
-sha256sum freedombone-meshclient-3_all-i386.img.xz
-74f9eaad479f84d3bf9cb002067074d35a97028145e781c5746c74577f777ee5
-unxz freedombone-meshclient-3_all-i386.img.xz
+wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.xz
+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
+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-3_all-i386.img of=/dev/sdX conv=fdatasync
+sudo dd bs=1M if=freedombone-meshclient-i386.img of=/dev/sdX conv=fdatasync
 #+end_src
 
 To get a number of systems onto the mesh repeat the /dd/ command to create however many bootable USB drives you need.
@@ -83,14 +84,14 @@ If you're in an emergency and don't have Atheros wifi dongles then there is also
 
 #+begin_src bash
 sudo apt-get install xz-utils wget
-wget https://freedombone.net/downloads/v3/freedombone-meshclient-insecure-3_all-i386.img.xz
-wget https://freedombone.net/downloads/v3/freedombone-meshclient-insecure-3_all-i386.img.xz.sig
-gpg --verify freedombone-meshclient-insecure-3_all-i386.img.xz.sig
-sha256sum freedombone-meshclient-insecure-3_all-i386.img.xz
-f1c5df24a4bfca47bd5c41dfd2568925e63a1abf83aecf0250480b4b8edc071d
-unxz freedombone-meshclient-insecure-3_all-i386.img.xz
+wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i386.img.xz
+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
+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-3_all-i386.img of=/dev/sdX conv=fdatasync
+sudo dd bs=1M if=freedombone-meshclient-insecure-i386.img of=/dev/sdX conv=fdatasync
 #+end_src
 
 ** Router images
@@ -233,6 +234,24 @@ One important point is that by default the microphone is turned off. When doing
 
 At present video doesn't work reliably, but text and voice chat do work well.
 
+** 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.
+
+Double click on the "Social" icon to open the app, then add your nickname and optionally a description. If you want to choose an avatar image some can be found within the directory */usr/share/freedombone/avatars*. On older systems or systems without a hardware random number generator, Patchwork sometimes takes a long time (a few minutes) to open for the first time after clicking the icon. This is most likely due to the initial generation of encryption keys, so be patient.
+
+#+BEGIN_CENTER
+[[file:images/patchwork_setup.jpg]]
+#+END_CENTER
+
+Other Patchwork users on the mesh will appear automatically under the *local* list and you can select and follow them if you wish. It's also possible to select the dark theme from *settings* on the drop down menu if you prefer.
+
+#+BEGIN_CENTER
+[[file:images/patchwork_public.jpg]]
+#+END_CENTER
+
+The Secure Scuttlebutt protocol which Patchwork is based upon is intended to be robust to intermittent network connectivity, so you can write posts when out of range and they will sync once you are back in the network.
+
 ** 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.
 

src/freedombone-app-ipfs

@@ -408,13 +408,13 @@ function mesh_install_ipfs_go {
     if [[ $ARCHITECTURE == *"amd64" || $ARCHITECTURE == "x86_64" ]]; then
         IPFS_ARCH=amd64
     fi
-    if [[ $ARCHITECTURE == *"arm"* ]]; then
+    if [[ $ARCHITECTURE == *"arm"* || $ARCHITECTURE == *"aarch"* ]]; then
         IPFS_ARCH=arm
     fi
     if [ ! $IPFS_ARCH ]; then
         echo $'No architecture specified'
         ARCHITECTURE=$(uname -m)
-        if [[ $ARCHITECTURE == "arm"* ]]; then
+        if [[ $ARCHITECTURE == "arm"* || $ARCHITECTURE == *"aarch"* ]]; then
             IPFS_ARCH=arm
             echo $"Using $IPFS_ARCH"
         fi
@@ -427,6 +427,10 @@ function mesh_install_ipfs_go {
             echo $"Using $IPFS_ARCH"
         fi
     fi
+    if [ ! $IPFS_ARCH ]; then
+        echo $'Architecture not detected for IPFS install'
+        exit 738765235
+    fi
 
     IPFS_FILE=go-ipfs_v${IPFS_GO_VERSION}_linux-${IPFS_ARCH}.tar.gz
     wget https://ipfs.io/ipns/dist.ipfs.io/go-ipfs/v${IPFS_GO_VERSION}/${IPFS_FILE}

src/freedombone-base-email

@@ -1380,12 +1380,17 @@ function configure_gpg {
         MY_GPG_PUBLIC_KEY_ID=$(gpg_pubkey_from_email "$MY_USERNAME" "$MY_EMAIL_ADDRESS")
         if [ ${#MY_GPG_PUBLIC_KEY_ID} -lt 4 ]; then
             echo $'GPG public key ID could not be obtained'
+        else
+            if [[ "$MY_GPG_PUBLIC_KEY_ID" == *'error'* ]]; then
+                echo $"Can't locate gpg key"
+            else
+                chown -R $MY_USERNAME:$MY_USERNAME $gpg_dir
+                chmod 700 $gpg_dir
+                chmod 600 $gpg_dir/*
+                mark_completed $FUNCNAME
+                return
+            fi
         fi
-        chown -R $MY_USERNAME:$MY_USERNAME $gpg_dir
-        chmod 700 $gpg_dir
-        chmod 600 $gpg_dir/*
-        mark_completed $FUNCNAME
-        return
     fi
 
     if [ ! -d $gpg_dir ]; then
@@ -1396,6 +1401,9 @@ function configure_gpg {
 
     sed -i "s|keyserver hkp://keys.gnupg.net|keyserver $GPG_KEYSERVER|g" $gpg_dir/gpg.conf
 
+    gpg_agent_setup root
+    gpg_agent_setup $MY_USERNAME
+
     if ! grep -q "# default preferences" $gpg_dir/gpg.conf; then
         echo '' >> $gpg_dir/gpg.conf
         echo '# default preferences' >> $gpg_dir/gpg.conf
@@ -1456,8 +1464,6 @@ function configure_gpg {
         chmod 700 /root/.gnupg
         chmod 600 /root/.gnupg/*
     fi
-    gpg_agent_setup root
-    gpg_agent_setup $MY_USERNAME
 
     mark_completed $FUNCNAME
 }

src/freedombone-image-customise

@@ -568,6 +568,9 @@ install_patchwork() {
     get_npm_arch
 
     git clone $PATCHWORK_REPO $rootdir/etc/patchwork
+    if [ ! -d $rootdir/etc/patchwork ]; then
+        exit 7823520
+    fi
     cd $rootdir/etc/patchwork
     git checkout $PATCHWORK_COMMIT -b $PATCHWORK_COMMIT
 
@@ -581,12 +584,6 @@ npm install --arch=$NPM_ARCH git-ssb
 EOF
     chroot "$rootdir" /bin/chmod +x /usr/bin/install_patchwork
     chroot "$rootdir" /usr/bin/install_patchwork
-    if [ ! -f /usr/bin/patchwork ]; then
-        if [ ! -f /usr/local/bin/patchwork ]; then
-            echo $'Unable to install SSB Patchwork peer'
-            exit 783524
-        fi
-    fi
     rm $rootdir/usr/bin/install_patchwork
 
     echo '#!/bin/bash' > $rootdir/usr/bin/start_patchwork
@@ -595,7 +592,7 @@ EOF
     chmod +x $rootdir/usr/bin/start_patchwork
 
     # Copy icon to an accesible location
-    cp /root/$PROJECT_NAME/img/icon_patchwork.png /etc/patchwork/icon_patchwork.png
+    cp $rootdir/root/$PROJECT_NAME/img/icon_patchwork.png $rootdir/etc/patchwork/icon_patchwork.png
 }
 
 initialise_mesh() {
@@ -1170,6 +1167,13 @@ function image_setup_utils {
     if [[ $ARCHITECTURE == *"arm"* ]]; then
         GOARCH=armv6l
     fi
+    if [[ $ARCHITECTURE == *"aarch"* || $ARCHITECTURE == *"arm64"* ]]; then
+        GOARCH=arm64
+    fi
+    if [ ! $GOARCH ]; then
+        echo $'System architecture was not specified when installing Go'
+        exit 6734378
+    fi
     GO_SOURCE=https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GOARCH}.tar.gz
 
     if [ ! -d ${rootdir}/root/build ]; then

src/freedombone-image-mesh

@@ -589,6 +589,11 @@ if [ -f $MESH_INSTALL_SETUP ]; then
         rm $INSTALL_LOG
     fi
 
+    # Remove SSB/Patchwork files
+    if [ -d /home/$MY_USERNAME/.ssb ]; then
+        rm -rf /home/$MY_USERNAME/.ssb
+    fi
+
     echo $'Beginning mesh node setup' >> $INSTALL_LOG
 
     if [ -d /home/$MY_USERNAME/.config ]; then

src/freedombone-utils-backup

@@ -77,6 +77,9 @@ function configure_backup_key {
         return
     fi
 
+    gpg_agent_setup root
+    gpg_agent_setup $MY_USERNAME
+
     # Generate a GPG key for backups
     BACKUP_KEY_EXISTS=$(gpg_key_exists "$MY_USERNAME" "$MY_NAME (backup key)")
     if [[ $BACKUP_KEY_EXISTS == "no" ]]; then
@@ -108,12 +111,14 @@ function configure_backup_key {
     echo "Backup key: $MY_BACKUP_KEY_ID"
     MY_BACKUP_KEY=/home/$MY_USERNAME/backup_key
     su -m root -c "gpg --homedir /home/$MY_USERNAME/.gnupg --output ${MY_BACKUP_KEY}_public.asc --armor --export $MY_BACKUP_KEY_ID" - $MY_USERNAME
-    su -m root -c "echo '$BACKUP_DUMMY_PASSWORD' | gpg --homedir /home/$MY_USERNAME/.gnupg --output ${MY_BACKUP_KEY}_private.asc --armor --batch --passphrase-fd 0 --export-secret-key $MY_BACKUP_KEY_ID" - $MY_USERNAME
 
     if [ ! -f ${MY_BACKUP_KEY}_public.asc ]; then
         echo 'Public backup key could not be exported'
         exit 36829
     fi
+
+    su -m root -c "echo '$BACKUP_DUMMY_PASSWORD' | gpg --homedir /home/$MY_USERNAME/.gnupg --output ${MY_BACKUP_KEY}_private.asc --armor --batch --passphrase-fd 0 --export-secret-key $MY_BACKUP_KEY_ID" - $MY_USERNAME
+
     if [ ! -f ${MY_BACKUP_KEY}_private.asc ]; then
         echo 'Private backup key could not be exported'
         exit 29235

src/freedombone-utils-go

@@ -32,7 +32,7 @@
 # before getting to the version we want
 GO_INTERMEDIATE_VERSION=1.4.2
 
-GO_VERSION=1.8
+GO_VERSION=1.9
 
 GO_REPO="https://go.googlesource.com/go"
 GO_PACKAGE_MANAGER_REPO="https://github.com/gpmgo/gopm"
@@ -147,6 +147,9 @@ function mesh_upgrade_golang {
     if [[ $ARCHITECTURE == *"arm"* ]]; then
         GOARCH=armv6l
     fi
+    if [[ $ARCHITECTURE == *"aarch"* || $ARCHITECTURE == *"arm64"* ]]; then
+        GOARCH=arm64
+    fi
     if [ ! $GOARCH ]; then
         echo $'No architecture specified'
         ARCHITECTURE=$(uname -m)
@@ -154,6 +157,10 @@ function mesh_upgrade_golang {
             GOARCH=armv6l
             echo $"Using $GOARCH"
         fi
+        if [[ $ARCHITECTURE == *"aarch"* || $ARCHITECTURE == *"arm64"* ]]; then
+            GOARCH=arm64
+            echo $"Using $GOARCH"
+        fi
         if [[ $ARCHITECTURE == "amd"* || $ARCHITECTURE == "x86_64" ]]; then
             GOARCH=amd64
             echo $"Using $GOARCH"
@@ -163,6 +170,11 @@ function mesh_upgrade_golang {
             echo $"Using $GOARCH"
         fi
     fi
+    if [ ! $GOARCH ]; then
+        echo $'System architecture was not detected when installing Go'
+        echo "uname reports: $(uname -m)"
+        exit 63945284
+    fi
     GO_SOURCE=https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GOARCH}.tar.gz
 
     if [ ! -d ${rootdir}${INSTALL_DIR} ]; then

src/freedombone-utils-gpg

@@ -102,15 +102,15 @@ function gpg_create_key {
     echo $'Generating a new GPG key'
     su -m root -c "gpg --homedir /home/$key_username/.gnupg --batch --full-gen-key /home/$key_username/gpg-genkey.conf" - $key_username
     chown -R $key_username:$key_username /home/$key_username/.gnupg
-    KEY_EXISTS=$(gpg_key_exists "$key_username" "${key_username}@${HOSTNAME}")
+    KEY_EXISTS=$(gpg_key_exists "$key_username" "$MY_EMAIL_ADDRESS")
     if [[ $KEY_EXISTS == "no" ]]; then
-        echo $"A GPG key for ${key_username}@${HOSTNAME} could not be created"
+        echo $"A GPG key for $MY_EMAIL_ADDRESS could not be created"
         exit 63621
     fi
     shred -zu /home/$key_username/gpg-genkey.conf
-    CURR_GPG_PUBLIC_KEY_ID=$(gpg_pubkey_from_email "$key_username" "${key_username}@${HOSTNAME}")
+    CURR_GPG_PUBLIC_KEY_ID=$(gpg_pubkey_from_email "$key_username" "$MY_EMAIL_ADDRESS")
     if [ ${#CURR_GPG_PUBLIC_KEY_ID} -lt 4 ]; then
-        echo $"GPG public key ID could not be obtained for ${key_username}@${HOSTNAME}"
+        echo $"GPG public key ID could not be obtained for $MY_EMAIL_ADDRESS"
         exit 825292
     fi
     gpg_set_permissions $key_username

src/freedombone-utils-nodejs

@@ -50,6 +50,10 @@ function get_npm_arch {
         NPM_ARCH='armv7l'
         N_ARCH='arm'
     fi
+    if [[ $ARCHITECTURE == *"aarch"* ]]; then
+        NPM_ARCH='arm64'
+        N_ARCH='arm64'
+    fi
     if [[ $ARCHITECTURE == 'x86_64' || $ARCHITECTURE == 'amd64' ]]; then
         NPM_ARCH='x64'
         N_ARCH='x64'
@@ -165,49 +169,58 @@ function install_nodejs {
         return
     fi
 
-    if [ ! -f /usr/bin/nodejs ]; then
-        # Note: this has to be jessie for now
-        wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key > /root/node.gpg.key
-        apt-key add /root/node.gpg.key
-        echo "deb https://deb.nodesource.com/node_6.x jessie main" > /etc/apt/sources.list.d/nodesource.list
-        echo "deb-src https://deb.nodesource.com/node_6.x jessie main" >> /etc/apt/sources.list.d/nodesource.list
-
-        apt-get update
-
-        apt-get -yq remove --purge nodejs
-
-        if [ -d /usr/local/lib/node_modules ]; then
-            rm -rf /usr/local/lib/node_modules
-        fi
-        if [ -f /usr/local/bin/node ]; then
-            rm /usr/local/bin/node
-        fi
-        if [ -f /usr/bin/node ]; then
-            rm /usr/bin/node
-        fi
-        if [ -f /usr/bin/nodejs ]; then
-            rm /usr/bin/nodejs
-        fi
-
-        apt-get -yq install nodejs
-        apt-get -yq install curl
-
-        if [ ! -f /usr/bin/nodejs ]; then
-            echo $'nodejs was not installed'
-            exit 63962
-        fi
+    if [ ! $ARCHITECTURE ]; then
+        ARCHITECTURE=$(uname -m)
     fi
+    rootdir=
+    mesh_install_nodejs
 
-    npm install -g npm@${NPM_VERSION} --save
-    npm install -g n@${NODEJS_N_VERSION} --save
-    n ${NODEJS_VERSION}
-    npm install -g pug@2.0.0-beta6 --save
-    npm install -g graceful-fs@4.1.10 --save
-    npm install -g minimatch@3.0.3 --save
+
+    #if [ ! -f /usr/bin/nodejs ]; then
+        # Note: this has to be jessie for now
+    #    wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key > /root/node.gpg.key
+    #    apt-key add /root/node.gpg.key
+    #    echo "deb https://deb.nodesource.com/node_6.x stretch main" > /etc/apt/sources.list.d/nodesource.list
+    #    echo "deb-src https://deb.nodesource.com/node_6.x stretch main" >> /etc/apt/sources.list.d/nodesource.list
+
+    #    apt-get update
+
+    #    apt-get -yq remove --purge nodejs
+
+    #    if [ -d /usr/local/lib/node_modules ]; then
+    #        rm -rf /usr/local/lib/node_modules
+    #    fi
+    #    if [ -f /usr/local/bin/node ]; then
+    #        rm /usr/local/bin/node
+    #    fi
+    #    if [ -f /usr/bin/node ]; then
+    #        rm /usr/bin/node
+    #    fi
+    #    if [ -f /usr/bin/nodejs ]; then
+    #        rm /usr/bin/nodejs
+    #    fi
+
+    #    apt-get -yq install nodejs
+    #    apt-get -yq install curl
+
+    #    if [ ! -f /usr/bin/nodejs ]; then
+    #        echo $'nodejs was not installed'
+    #        exit 63962
+    #    fi
+    #fi
+
+    #npm install -g npm@${NPM_VERSION} --save
+    #npm install -g n@${NODEJS_N_VERSION} --save
+    #n ${NODEJS_VERSION}
+    #npm install -g pug@2.0.0-beta6 --save
+    #npm install -g graceful-fs@4.1.10 --save
+    #npm install -g minimatch@3.0.3 --save
     npm install -g npm@${NPM_VERSION} --save
 
-    cp /usr/local/bin/node /usr/bin/nodejs
-    cp /usr/local/bin/npm /usr/bin/npm
+    #cp /usr/local/bin/node /usr/bin/nodejs
+    if [ -f /usr/local/bin/npm ]; then
+        cp /usr/local/bin/npm /usr/bin/npm
+    fi
 
     # node seems tricky so here we're going to double check
     # that the versions we expect did get installed

src/freedombone-utils-onion

@@ -275,6 +275,9 @@ function install_tor {
         exit 38259
     fi
 
+    # For torify
+    apt-get -yq install torsocks
+
     # turn off logging
     sed -i 's|#Log notice file.*|Log notice file /dev/null|g' /etc/tor/torrc
     sed -i 's|Log notice file.*|Log notice file /dev/null|g' /etc/tor/torrc

website/EN/mesh.html

@@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2017-09-15 Fri 22:19 -->
+<!-- 2017-09-18 Mon 11:40 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title></title>
@@ -274,13 +274,13 @@ for the JavaScript code in this tag.
 </colgroup>
 <tbody>
 <tr>
-<td class="org-left"><a href="#orgc6406cc">What the system can do</a></td>
+<td class="org-left"><a href="#org81ddb36">What the system can do</a></td>
 <td class="org-left">-</td>
-<td class="org-left"><a href="#orgf24c15c">Disk Images</a></td>
+<td class="org-left"><a href="#orgdc7c539">Disk Images</a></td>
 <td class="org-left">-</td>
-<td class="org-left"><a href="#org08c02eb">Building Disk Images</a></td>
+<td class="org-left"><a href="#orgef64a0e">Building Disk Images</a></td>
 <td class="org-left">-</td>
-<td class="org-left"><a href="#orgfce6a77">How to use it</a></td>
+<td class="org-left"><a href="#orgf01387f">How to use it</a></td>
 </tr>
 </tbody>
 </table>
@@ -293,21 +293,22 @@ The Freedombone Mesh is a wireless solution for autonomous communication that ca
 Mesh networks are useful as a quick way to make a fully decentralised communications system which is not connected to or reliant upon the internet. Think festivals, hacker conferences, onboard ships at sea, disaster/war zones, small business internal office communications, protests, remote areas of the world, temporary "digital blackouts", scientific expeditions and off-world space colonies. The down side is that you can't access any internet content. The upside is that you can securely communicate with anyone on the local mesh. No ISPs. No payments or subscriptions beyond the cost of obtaining the hardware. Systems need to be within wifi range of each other for the mesh to be created. It can be an ultra-convenient way to do purely local communications.
 </p>
 
-<div id="outline-container-orgc6406cc" class="outline-2">
-<h2 id="orgc6406cc">What the system can do</h2>
-<div class="outline-text-2" id="text-orgc6406cc">
+<div id="outline-container-org81ddb36" class="outline-2">
+<h2 id="org81ddb36">What the system can do</h2>
+<div class="outline-text-2" id="text-org81ddb36">
 <ul class="org-ul">
 <li>Discovery of other users on the network</li>
 <li>Text based chat, one-to-one and in groups</li>
 <li>Voice chat (VoIP)</li>
 <li>Private and public sharing of files</li>
 <li>Blogging</li>
+<li>Social network stream. Follow/unfollow other peers</li>
 <li>No network administration required</li>
-<li>No servers, internet connection or cabling is needed.</li>
-<li>Works from bootable USB drives or microSD drives.</li>
+<li>No servers, internet connection or cabling is needed</li>
+<li>Works from bootable USB drives or microSD drives</li>
 <li>Data is mesh routed between systems</li>
-<li>Private communications is end-to-end secured and forward secret.</li>
-<li>Publicly shared data is <i>content addressable</i>.</li>
+<li>Private communications is end-to-end secured and forward secret</li>
+<li>Publicly shared data is <i>content addressable</i></li>
 </ul>
 
 <p>
@@ -316,13 +317,13 @@ This system should be quite scalable. Both qTox and IPFS are based upon distribu
 </div>
 </div>
 
-<div id="outline-container-orgf24c15c" class="outline-2">
-<h2 id="orgf24c15c">Disk Images</h2>
-<div class="outline-text-2" id="text-orgf24c15c">
+<div id="outline-container-orgdc7c539" class="outline-2">
+<h2 id="orgdc7c539">Disk Images</h2>
+<div class="outline-text-2" id="text-orgdc7c539">
 </div>
-<div id="outline-container-org88842fc" class="outline-3">
-<h3 id="org88842fc">Writing many images quickly</h3>
-<div class="outline-text-3" id="text-org88842fc">
+<div id="outline-container-org41eb788" class="outline-3">
+<h3 id="org41eb788">Writing many images quickly</h3>
+<div class="outline-text-3" id="text-org41eb788">
 <p>
 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 <b>dd</b> command is used for writing to the target drive, but to write to multiple drives you can use a tool such as <a href="https://wiki.gnome.org/Apps/MultiWriter">GNOME MultiWriter</a>.
 </p>
@@ -346,9 +347,9 @@ Or on Debian based systems:
 </div>
 </div>
 </div>
-<div id="outline-container-org4a8b638" class="outline-3">
-<h3 id="org4a8b638">Client images</h3>
-<div class="outline-text-3" id="text-org4a8b638">
+<div id="outline-container-orgb7d45bb" class="outline-3">
+<h3 id="orgb7d45bb">Client images</h3>
+<div class="outline-text-3" id="text-orgb7d45bb">
 <div class="org-center">
 
 <div class="figure">
@@ -363,14 +364,14 @@ Or on Debian based systems:
 
 <div class="org-src-container">
 <pre><code class="src src-bash">sudo apt-get install xz-utils wget
-wget https://freedombone.net/downloads/v3/freedombone-meshclient-3_all-i386.img.xz
-wget https://freedombone.net/downloads/v3/freedombone-meshclient-3_all-i386.img.xz.sig
-gpg --verify freedombone-meshclient-3_all-i386.img.xz.sig
-sha256sum freedombone-meshclient-3_all-i386.img.xz
-74f9eaad479f84d3bf9cb002067074d35a97028145e781c5746c74577f777ee5
-unxz freedombone-meshclient-3_all-i386.img.xz
+wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.xz
+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
+unxz freedombone-meshclient-i386.img.xz
 sudo dd <span class="org-variable-name">if</span>=/dev/zero <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">count</span>=8
-sudo dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">if</span>=freedombone-meshclient-3_all-i386.img <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">conv</span>=fdatasync
+sudo dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">if</span>=freedombone-meshclient-i386.img <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">conv</span>=fdatasync
 </code></pre>
 </div>
 
@@ -384,29 +385,29 @@ If you're in an emergency and don't have Atheros wifi dongles then there is also
 
 <div class="org-src-container">
 <pre><code class="src src-bash">sudo apt-get install xz-utils wget
-wget https://freedombone.net/downloads/v3/freedombone-meshclient-insecure-3_all-i386.img.xz
-wget https://freedombone.net/downloads/v3/freedombone-meshclient-insecure-3_all-i386.img.xz.sig
-gpg --verify freedombone-meshclient-insecure-3_all-i386.img.xz.sig
-sha256sum freedombone-meshclient-insecure-3_all-i386.img.xz
-f1c5df24a4bfca47bd5c41dfd2568925e63a1abf83aecf0250480b4b8edc071d
-unxz freedombone-meshclient-insecure-3_all-i386.img.xz
+wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i386.img.xz
+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
+unxz freedombone-meshclient-insecure-i386.img.xz
 sudo dd <span class="org-variable-name">if</span>=/dev/zero <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">count</span>=8
-sudo dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">if</span>=freedombone-meshclient-insecure-3_all-i386.img <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">conv</span>=fdatasync
+sudo dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">if</span>=freedombone-meshclient-insecure-i386.img <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">conv</span>=fdatasync
 </code></pre>
 </div>
 </div>
 </div>
 
-<div id="outline-container-org519744c" class="outline-3">
-<h3 id="org519744c">Router images</h3>
-<div class="outline-text-3" id="text-org519744c">
+<div id="outline-container-orgb012fc0" class="outline-3">
+<h3 id="orgb012fc0">Router images</h3>
+<div class="outline-text-3" id="text-orgb012fc0">
 <p>
 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.
 </p>
 </div>
-<div id="outline-container-org909807a" class="outline-4">
-<h4 id="org909807a">Beaglebone Black</h4>
-<div class="outline-text-4" id="text-org909807a">
+<div id="outline-container-org86225c6" class="outline-4">
+<h4 id="org86225c6">Beaglebone Black</h4>
+<div class="outline-text-4" id="text-org86225c6">
 <div class="org-center">
 
 <div class="figure">
@@ -443,9 +444,9 @@ There is still a software freedom issue with the Beaglebone Black, but it doesn'
 </div>
 </div>
 
-<div id="outline-container-org08c02eb" class="outline-2">
-<h2 id="org08c02eb">Building Disk Images</h2>
-<div class="outline-text-2" id="text-org08c02eb">
+<div id="outline-container-orgef64a0e" class="outline-2">
+<h2 id="orgef64a0e">Building Disk Images</h2>
+<div class="outline-text-2" id="text-orgef64a0e">
 <p>
 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.
 </p>
@@ -533,9 +534,9 @@ The resulting image can be copied to a microSD card, inserted into a Beaglebone
 </div>
 </div>
 
-<div id="outline-container-org0dec35a" class="outline-2">
-<h2 id="org0dec35a">Customisation</h2>
-<div class="outline-text-2" id="text-org0dec35a">
+<div id="outline-container-org6358707" class="outline-2">
+<h2 id="org6358707">Customisation</h2>
+<div class="outline-text-2" id="text-org6358707">
 <p>
 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 <b>img/backgrounds</b> and to change the available avatars and desktop icons edit the images within <b>img/avatars</b>. Re-create disk images using the instructions shown previously.
 </p>
@@ -545,9 +546,9 @@ If you need particular <i>dconf</i> commands to alter desktop appearance or beha
 </p>
 </div>
 </div>
-<div id="outline-container-orgfce6a77" class="outline-2">
-<h2 id="orgfce6a77">How to use it</h2>
-<div class="outline-text-2" id="text-orgfce6a77">
+<div id="outline-container-orgf01387f" class="outline-2">
+<h2 id="orgf01387f">How to use it</h2>
+<div class="outline-text-2" id="text-orgf01387f">
 <p>
 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.
 </p>
@@ -557,9 +558,9 @@ After a minute or two if you are within wifi range and there is at least one oth
 </p>
 </div>
 
-<div id="outline-container-org2a6eb8c" class="outline-3">
-<h3 id="org2a6eb8c">Boot trouble</h3>
-<div class="outline-text-3" id="text-org2a6eb8c">
+<div id="outline-container-org5ee0eb2" class="outline-3">
+<h3 id="org5ee0eb2">Boot trouble</h3>
+<div class="outline-text-3" id="text-org5ee0eb2">
 <p>
 If the system doesn't boot and reports an error which includes <b>/dev/mapper/loop0p1</b> then reboot with <b>Ctrl-Alt-Del</b> and when you see the grub menu press <b>e</b> and manually change <b>/dev/mapper/loop0p1</b> to <b>/dev/sdb1</b>, then press <b>Ctrl-x</b>. If that doesn't work then reboot and try <b>/dev/sdc1</b> instead.
 </p>
@@ -569,9 +570,9 @@ After the system has booted successfully the problem should resolve itself on su
 </p>
 </div>
 </div>
-<div id="outline-container-org92cd6d5" class="outline-3">
-<h3 id="org92cd6d5">Set the Date</h3>
-<div class="outline-text-3" id="text-org92cd6d5">
+<div id="outline-container-org57403bb" class="outline-3">
+<h3 id="org57403bb">Set the Date</h3>
+<div class="outline-text-3" id="text-org57403bb">
 <p>
 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.
 </p>
@@ -581,9 +582,9 @@ On the ordinary internet the date and time of your system would be set automatic
 </p>
 </div>
 </div>
-<div id="outline-container-org2aa12f0" class="outline-3">
-<h3 id="org2aa12f0">Check network status</h3>
-<div class="outline-text-3" id="text-org2aa12f0">
+<div id="outline-container-orge4196db" class="outline-3">
+<h3 id="orge4196db">Check network status</h3>
+<div class="outline-text-3" id="text-orge4196db">
 <p>
 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.
 </p>
@@ -607,9 +608,9 @@ When you are finished close the window and then select the <i>Network Restart</i
 </div>
 </div>
 
-<div id="outline-container-org2f1dfa6" class="outline-3">
-<h3 id="org2f1dfa6">Chat System</h3>
-<div class="outline-text-3" id="text-org2f1dfa6">
+<div id="outline-container-org07b0383" class="outline-3">
+<h3 id="org07b0383">Chat System</h3>
+<div class="outline-text-3" id="text-org07b0383">
 <p>
 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 <i>Chat</i> and <i>Other Users</i> icons appear. Select the users icon and you should see a list of users on the mesh. Select the <i>Chat</i> 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.
 </p>
@@ -668,9 +669,46 @@ At present video doesn't work reliably, but text and voice chat do work well.
 </div>
 </div>
 
-<div id="outline-container-org75993b2" class="outline-3">
-<h3 id="org75993b2">Sharing Files</h3>
-<div class="outline-text-3" id="text-org75993b2">
+<div id="outline-container-org56b3e5d" class="outline-3">
+<h3 id="org56b3e5d">Social Network</h3>
+<div class="outline-text-3" id="text-org56b3e5d">
+<p>
+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.
+</p>
+
+<p>
+Double click on the "Social" icon to open the app, then add your nickname and optionally a description. If you want to choose an avatar image some can be found within the directory <b>/usr/share/freedombone/avatars</b>. On older systems or systems without a hardware random number generator, Patchwork sometimes takes a long time (a few minutes) to open for the first time after clicking the icon. This is most likely due to the initial generation of encryption keys, so be patient.
+</p>
+
+<div class="org-center">
+
+<div class="figure">
+<p><img src="images/patchwork_setup.jpg" alt="patchwork_setup.jpg" />
+</p>
+</div>
+</div>
+
+<p>
+Other Patchwork users on the mesh will appear automatically under the <b>local</b> list and you can select and follow them if you wish. It's also possible to select the dark theme from <b>settings</b> on the drop down menu if you prefer.
+</p>
+
+<div class="org-center">
+
+<div class="figure">
+<p><img src="images/patchwork_public.jpg" alt="patchwork_public.jpg" />
+</p>
+</div>
+</div>
+
+<p>
+The Secure Scuttlebutt protocol which Patchwork is based upon is intended to be robust to intermittent network connectivity, so you can write posts when out of range and they will sync once you are back in the network.
+</p>
+</div>
+</div>
+
+<div id="outline-container-orgc281f16" class="outline-3">
+<h3 id="orgc281f16">Sharing Files</h3>
+<div class="outline-text-3" id="text-orgc281f16">
 <p>
 You can make files publicly available on the network simply by dragging and dropping them into the <i>Public</i> folder on the desktop. To view the files belonging to another user select the desktop icon called <i>Visit a site</i> and enter the username or Tox ID of the other user.
 </p>
@@ -685,9 +723,9 @@ You can make files publicly available on the network simply by dragging and drop
 </div>
 </div>
 
-<div id="outline-container-org86cab79" class="outline-3">
-<h3 id="org86cab79">Blogging</h3>
-<div class="outline-text-3" id="text-org86cab79">
+<div id="outline-container-org12f7a3e" class="outline-3">
+<h3 id="org12f7a3e">Blogging</h3>
+<div class="outline-text-3" id="text-org12f7a3e">
 <p>
 To create a blog post select the <i>Blog</i> 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 <b>CreateBlog/content/images</b> directory and then link to them as shown.
 </p>