From 13ce2eaf9748854fac59165be2f93df9f3d58932 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 19 Nov 2018 11:07:06 +0000
Subject: [PATCH] Update documentation for old style mesh image downloads

---
 doc/EN/mesh_images.org      | 66 ++++++++--------------------
 website/EN/mesh_images.html | 87 ++++++++-----------------------------
 2 files changed, 35 insertions(+), 118 deletions(-)

diff --git a/doc/EN/mesh_images.org b/doc/EN/mesh_images.org
index a6d90e9d9..eab096a43 100644
--- a/doc/EN/mesh_images.org
+++ b/doc/EN/mesh_images.org
@@ -35,24 +35,17 @@ The MultiWriter tool is also available within mesh client images, so that you ca
 
 "Client" isn't exactly the right term, but it's a mesh peer with a user interface. These images can be copied to a USB drive, then you can plug it into a laptop/netbook/desktop machine and boot from it. You will probably also need an Atheros USB wifi dongle (the black protruding object on the left side of the netbook in the picture above), because most built-in wifi usually requires proprietary firmware. In the commands below substitute /dev/sdX with the USB drive device, excluding any trailing numbers (eg. /dev/sdb). The USB drive you're copying to will need to be at least 16GB in size.
 
-Install some prerequisites:
+Download the following files. They're about 2.3GB in size, so be prepared to wait.
 
 #+begin_src bash
-sudo apt-get install xz-utils nodejs
-sudo npm install -g dat
+wget https://freedombone.net/downloads/freedombone-meshclient-i386.img.xz
+wget https://freedombone.net/downloads/freedombone-meshclient-i386.img.xz.asc
 #+end_src
 
-To download images with dat:
+Check the signature and extract the image:
 
 #+begin_src bash
-dat clone dat://e2ed9767d6ab64f4c43a2adbce65af225133fec7ba95737f0a2f6ae292ba358e/
-cd e2ed9767d6ab64f4c43a2adbce65af225133fec7ba95737f0a2f6ae292ba358e
-#+end_src
-
-Check the signature:
-
-#+begin_src bash
-gpg --verify freedombone-meshclient-i386.img.xz.sig
+gpg --verify freedombone-meshclient-i386.img.xz.asc
 unxz freedombone-meshclient-i386.img.xz
 #+end_src
 
@@ -67,24 +60,17 @@ To get a number of systems onto the mesh repeat the /dd/ command to create howev
 
 If you're in an emergency and don't have Atheros wifi dongles then there is also an "insecure" image which contains some proprietary wifi drivers which may work with a wider range of laptops. Proprietary drivers *are not recommended* because they're unsupportable and may be exploitable or contain malicious antifeatures which fundamentally compromise the security of the network. However, the trade-off between security/maintainability and simply having the ability to communicate at all may be a valid one in some situations.
 
-Install some prerequisites:
+Download the following files. They're about 2.3GB in size, so be prepared to wait.
 
 #+begin_src bash
-sudo apt-get install xz-utils nodejs
-sudo npm install -g dat
-#+end_src
-
-To download images with dat:
-
-#+begin_src bash
-dat clone dat://6d1b73d13b6f9b5c481c6dfd64be6aa58e1cd2d153a6bb04bbc177999ee9925e/
-cd 6d1b73d13b6f9b5c481c6dfd64be6aa58e1cd2d153a6bb04bbc177999ee9925e
+wget https://freedombone.net/downloads/freedombone-meshclient-insecure-i386.img.xz
+wget https://freedombone.net/downloads/freedombone-meshclient-insecure-i386.img.xz.asc
 #+end_src
 
 Check the signature:
 
 #+begin_src bash
-gpg --verify freedombone-meshclient-insecure-i386.img.xz.sig
+gpg --verify freedombone-meshclient-insecure-i386.img.xz.asc
 unxz freedombone-meshclient-insecure-i386.img.xz
 #+end_src
 
@@ -103,24 +89,17 @@ Routers are intended to build network coverage for an area using small and low c
 
 The above picture shows a Beaglebone Black with the image copied onto a microSD card (there's no need to do anything with the internal EMMC). A USB Atheros wifi adaptor with a large antenna is attached and in this case power is from the mains, although it could be from a battery or solar power system capable of supplying 5 volts and maybe 1A (depending upon how active the router is).
 
-Install some prerequisites:
+Download the following files. They're about 2GB in size, so be prepared to wait.
 
 #+begin_src bash
-sudo apt-get install xz-utils nodejs
-sudo npm install -g dat
-#+end_src
-
-To download images with dat:
-
-#+begin_src bash
-dat clone dat://a4e79e49c6e77b919d4ae4827037e813ef1ba2734c342d0d78146ce16a819ebb/
-cd a4e79e49c6e77b919d4ae4827037e813ef1ba2734c342d0d78146ce16a819ebb
+wget https://freedombone.net/downloads/freedombone-mesh_beagleboneblack-armhf.img.xz
+wget https://freedombone.net/downloads/freedombone-mesh_beagleboneblack-armhf.img.xz.asc
 #+end_src
 
 Check the signature:
 
 #+begin_src bash
-gpg --verify freedombone-mesh_beagleboneblack-armhf.img.sig
+gpg --verify freedombone-mesh_beagleboneblack-armhf.img.asc
 unxz freedombone-mesh_beagleboneblack-armhf.img.xz
 #+end_src
 
@@ -141,27 +120,20 @@ It's better not to trust images downloaded from random places on the interwebs.
 First you will need to create an image. On a Debian based system (tested on Debian Stretch):
 
 #+begin_src bash
-sudo apt-get install xz-utils nodejs
-sudo npm install -g dat
-#+end_src
-
-To download images with dat:
-
-#+begin_src bash
-dat clone dat://e9cbf606e55cdaa85199f4e6ec25ff7456775389979a668b3faf33e057493f8e/
-cd e9cbf606e55cdaa85199f4e6ec25ff7456775389979a668b3faf33e057493f8e
+wget https://freedombone.net/downloads/source.tar.gz
+wget https://freedombone.net/downloads/source.tar.gz.asc
 #+end_src
 
 Check the signature:
 
 #+begin_src bash
-gpg --verify freedombone.tar.gz.sig
+gpg --verify source.tar.gz.asc
 #+end_src
 
 Install it:
 
 #+begin_src bash
-tar -xzvf freedombone.tar.gz
+tar -xzvf source.tar.gz
 cd freedombone
 git checkout stretch
 sudo make install
@@ -215,7 +187,3 @@ freedombone-image -t beagleboneblack -v mesh
 #+end_src
 
 The resulting image can be copied to a microSD card, inserted into a Beaglebone Black and booted. Don't forget to plug in an Atheros USB wifi dongle.
-
-
-#+attr_html: :width 10% :height 2% :align center
-[[file:fdl-1.3.txt][file:images/gfdl.png]]
diff --git a/website/EN/mesh_images.html b/website/EN/mesh_images.html
index 17f0e18ef..3254928e4 100644
--- a/website/EN/mesh_images.html
+++ b/website/EN/mesh_images.html
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title>Freedombone</title>
-<!-- 2018-07-17 Tue 10:36 -->
+<!-- 2018-11-19 Mon 11:06 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta  name="generator" content="Org-mode" />
 <meta  name="author" content="Bob Mottram" />
@@ -204,34 +204,23 @@ The MultiWriter tool is also available within mesh client images, so that you ca
 </p>
 
 <p>
-Install some prerequisites:
+Download the following files. They're about 2.3GB in size, so be prepared to wait.
 </p>
 
 <div class="org-src-container">
 
-<pre class="src src-bash">sudo apt-get install xz-utils nodejs
-sudo npm install -g dat
+<pre class="src src-bash">wget https://freedombone.net/downloads/freedombone-meshclient-i386.img.xz
+wget https://freedombone.net/downloads/freedombone-meshclient-i386.img.xz.asc
 </pre>
 </div>
 
 <p>
-To download images with dat:
+Check the signature and extract the image:
 </p>
 
 <div class="org-src-container">
 
-<pre class="src src-bash">dat clone dat://e2ed9767d6ab64f4c43a2adbce65af225133fec7ba95737f0a2f6ae292ba358e/
-cd e2ed9767d6ab64f4c43a2adbce65af225133fec7ba95737f0a2f6ae292ba358e
-</pre>
-</div>
-
-<p>
-Check the signature:
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-bash">gpg --verify freedombone-meshclient-i386.img.xz.sig
+<pre class="src src-bash">gpg --verify freedombone-meshclient-i386.img.xz.asc
 unxz freedombone-meshclient-i386.img.xz
 </pre>
 </div>
@@ -256,24 +245,13 @@ If you're in an emergency and don't have Atheros wifi dongles then there is also
 </p>
 
 <p>
-Install some prerequisites:
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-bash">sudo apt-get install xz-utils nodejs
-sudo npm install -g dat
-</pre>
-</div>
-
-<p>
-To download images with dat:
+Download the following files. They're about 2.3GB in size, so be prepared to wait.
 </p>
 
 <div class="org-src-container">
 
-<pre class="src src-bash">dat clone dat://6d1b73d13b6f9b5c481c6dfd64be6aa58e1cd2d153a6bb04bbc177999ee9925e/
-cd 6d1b73d13b6f9b5c481c6dfd64be6aa58e1cd2d153a6bb04bbc177999ee9925e
+<pre class="src src-bash">wget https://freedombone.net/downloads/freedombone-meshclient-insecure-i386.img.xz
+wget https://freedombone.net/downloads/freedombone-meshclient-insecure-i386.img.xz.asc
 </pre>
 </div>
 
@@ -283,7 +261,7 @@ Check the signature:
 
 <div class="org-src-container">
 
-<pre class="src src-bash">gpg --verify freedombone-meshclient-insecure-i386.img.xz.sig
+<pre class="src src-bash">gpg --verify freedombone-meshclient-insecure-i386.img.xz.asc
 unxz freedombone-meshclient-insecure-i386.img.xz
 </pre>
 </div>
@@ -322,24 +300,13 @@ The above picture shows a Beaglebone Black with the image copied onto a microSD
 </p>
 
 <p>
-Install some prerequisites:
+Download the following files. They're about 2GB in size, so be prepared to wait.
 </p>
 
 <div class="org-src-container">
 
-<pre class="src src-bash">sudo apt-get install xz-utils nodejs
-sudo npm install -g dat
-</pre>
-</div>
-
-<p>
-To download images with dat:
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-bash">dat clone dat://a4e79e49c6e77b919d4ae4827037e813ef1ba2734c342d0d78146ce16a819ebb/
-cd a4e79e49c6e77b919d4ae4827037e813ef1ba2734c342d0d78146ce16a819ebb
+<pre class="src src-bash">wget https://freedombone.net/downloads/freedombone-mesh_beagleboneblack-armhf.img.xz
+wget https://freedombone.net/downloads/freedombone-mesh_beagleboneblack-armhf.img.xz.asc
 </pre>
 </div>
 
@@ -349,7 +316,7 @@ Check the signature:
 
 <div class="org-src-container">
 
-<pre class="src src-bash">gpg --verify freedombone-mesh_beagleboneblack-armhf.img.sig
+<pre class="src src-bash">gpg --verify freedombone-mesh_beagleboneblack-armhf.img.asc
 unxz freedombone-mesh_beagleboneblack-armhf.img.xz
 </pre>
 </div>
@@ -390,19 +357,8 @@ First you will need to create an image. On a Debian based system (tested on Debi
 
 <div class="org-src-container">
 
-<pre class="src src-bash">sudo apt-get install xz-utils nodejs
-sudo npm install -g dat
-</pre>
-</div>
-
-<p>
-To download images with dat:
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-bash">dat clone dat://e9cbf606e55cdaa85199f4e6ec25ff7456775389979a668b3faf33e057493f8e/
-cd e9cbf606e55cdaa85199f4e6ec25ff7456775389979a668b3faf33e057493f8e
+<pre class="src src-bash">wget https://freedombone.net/downloads/source.tar.gz
+wget https://freedombone.net/downloads/source.tar.gz.asc
 </pre>
 </div>
 
@@ -412,7 +368,7 @@ Check the signature:
 
 <div class="org-src-container">
 
-<pre class="src src-bash">gpg --verify freedombone.tar.gz.sig
+<pre class="src src-bash">gpg --verify source.tar.gz.asc
 </pre>
 </div>
 
@@ -422,7 +378,7 @@ Install it:
 
 <div class="org-src-container">
 
-<pre class="src src-bash">tar -xzvf freedombone.tar.gz
+<pre class="src src-bash">tar -xzvf source.tar.gz
 cd freedombone
 git checkout stretch
 sudo make install
@@ -513,13 +469,6 @@ You can also use single board computers (SBCs) such as the BeagleBone Black to m
 <p>
 The resulting image can be copied to a microSD card, inserted into a Beaglebone Black and booted. Don't forget to plug in an Atheros USB wifi dongle.
 </p>
-
-
-
-<div class="figure">
-<p><a href="fdl-1.3.txt" width="10%" height="2%" align="center"><img src="images/gfdl.png" alt="gfdl.png" width="10%" height="2%" align="center" /></a>
-</p>
-</div>
 </div>
 </div>
 </div>
-- 
GitLab