Redoing the installation instructions

doc/EN/installation.org

@@ -7,138 +7,129 @@
 #+BEGIN_CENTER
 [[./images/logo.png]]
 #+END_CENTER
-| [[file:index.html][Home]] | [[Preparation for the Beaglebone Black]] | [[Checklist]] | [[./mesh.html][Mesh network]] | [[Interactive Setup]] | [[Non-Interactive Setup]] | [[Post-Setup]] | [[Keydrives]] | [[On Client Machines]] |
+| [[file:index.html][Home]] | [[Building an image for an SBC or Virtual Machine]] | [[Checklist]] | [[./mesh.html][Mesh network]] | [[Installation]] | [[Social Key Management (aka 'The Unforgettable Key')]] | [[Final Setup]] | [[Keydrives]] | [[On Client Machines]] |
 
+* Building an image for an SBC or Virtual Machine
+You don't have to trust images downloaded from random internet locations signed with untrusted keys. You can build one from scratch yourself, and this is the recommended procedure for maximum security. For guidance on how to build images see the manpage for the *freedombone-image* command.
 
-* Preparation for the Beaglebone Black
-This section is specific to the Beaglebone Black hardware. If you're not using that hardware then just skip to the next section.
-
-To get started you will need:
-
- - A Beaglebone Black
- - A MicroSD card
- - Ethernet cable
- - Optionally a 5V 2A power supply for the Beaglebone Black
- - Access to the internet via a router with ethernet sockets
- - USB thumb drive (for backups or storing media)
- - One or more domains available via a dynamic DNS provider, such as https://freedns.afraid.org
- - A purchased domain name and SSL certificate (only needed for Hubzilla)
- - A laptop or desktop machine with the ability to write to a microSD card (might need an adaptor)
-
-You will also need to know, or find out, the IP address of your internet router and have a suitable static IP address for the Beaglebone on your local network. The router should allow you to forward ports to the Beaglebone (often this is under firewall or "advanced" settings).
-
-You can either install from a debian package or manually as follows:
+Install the freedombone commands onto your laptop/desktop:
 
 #+BEGIN_SRC bash
-sudo apt-get update
-sudo apt-get install git dialog build-essential
+sudo apt-get install git build-essential dialog
 git clone https://github.com/bashrc/freedombone
 cd freedombone
 sudo make install
 #+END_SRC
 
-Plug the microSD card into your laptop/desktop and then run the *freedombone-prep* command. For example:
+Then install packages needed for building images:
 
 #+BEGIN_SRC bash
-freedombone-prep -d /dev/sdX --ip freedombone_IP_address --iprouter router_IP_address
+sudo apt-get -y install python-docutils mktorrent vmdebootstrap
+sudo apt-get -y install dosfstools btrfs-tools extlinux python-distro-info mbr
+sudo apt-get -y install qemu-user-static binfmt-support u-boot-tools qemu
 #+END_SRC
 
-where /dev/sdX is the device name for the microSD card. Often it's /dev/sdb or /dev/sdc, depending upon how many drives there are on your system. The script will download the Debian installer and update the microSD card. It can take a while, so be patient.
+A typical use case to build an 8GB image for a Beaglebone Black is as follows. You can change the size depending upon the capacity of your microSD card.
+
+#+BEGIN_SRC bash
+freedombone-image -t beaglebone -s 8G
+#+END_SRC
+
+If you prefer an advanced installation with all of the options available then use:
+
+#+BEGIN_SRC bash
+freedombone-image -t beaglebone -s 8G --minimal no
+#+END_SRC
 
-When the initial setup is done follow the instructions on screen to run the main freedombone command.
+Other supported boards are cubieboard2, cubietruck and olinuxino-lime2.
 
 * Checklist
-Before running the freedombone command you will need a few things.
+Before installing Freedombone you will need a few things.
 
   * Have some domains, or subdomains, registered with a dynamic DNS service
-  * System with a new installation of Debian Jessie
-  * Ethernet connection to an internet router
-  * It is possible to forward ports from the internet router to the system
-  * If you want to set up a social network or microblog then you will need SSL certificates corresponding to those domains
-  * Have ssh access to the system
+  * System with a new installation of Debian Jessie or a downloaded/prepared disk image
+  * Ethernet connection between the system and your internet router
+  * That it is possible to forward ports from the internet router to the system, typically via firewall settings
+  * Have ssh access to the system, typically via fbone@freedombone.local on port 2222
 * Mesh network
 If you are installing one of the mesh network variants then see [[./mesh.html][these instructions]] for details.
-* Interactive Setup
-The interactive server configuration setup is recommended for most users. On the system where freedombone is to be installed create a configuration file.
+* Installation
+There are three install options: Laptop/Desktop/Netbook, SBC and Virtual Machine.
+
+** On a Laptop, Netbook or Desktop machine
+If you have an existing system, such as an old laptop or netbook which you can leave running as a server, then install a new version of Debian Jessie onto it. During the Debian install you won't need the print server or the desktop environment, and unchecking those will reduce the attack surface. Once Debian enter the following commands:
 
 #+BEGIN_SRC bash
-ssh myusername@freedombone_IP_address
 su
-sudo apt-get update
-apt-get install git dialog build-essential
+apt-get update
+apt-get -y install git dialog build-essential
 git clone https://github.com/bashrc/freedombone
 cd freedombone
 make install
+freedombone menuconfig
 #+END_SRC
 
-Now the easiest way to install the system is via the interactive setup.
+** On a single board computer (SBC)
+Currently the following boards are supported:
+
+    [[http://beagleboard.org/BLACK][Beaglebone Black]]
+    [[http://linux-sunxi.org/Cubietech_Cubieboard2][Cubieboard 2]]
+    [[https://linux-sunxi.org/Cubietruck][Cubietruck (Cubieboard 3)]]
+    [[https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXIno-LIME2/open-source-hardware][olinuxino Lime2]]
+
+If there is no existing image available then you can build one from scratch. See the section above on how to do that. If an existing image is available then you can download it and check the signature with:
 
 #+BEGIN_SRC bash
-freedombone menuconfig
+gpg --verify filename.img.asc
 #+END_SRC
 
-You can select which variant you wish to install and then enter the details as requested. A video of the install sequence can be [[./installer.ogv][seen here]].
+And the hash with:
 
-* Non-Interactive Setup
-If you don't want to install interactively then it's possible to manually create a configuration file as follows:
+#+BEGIN_SRC bash
+sha256sum filename.img
+#+END_SRC
 
-On the system where freedombone is to be installed create a configuration file.
+If the image is compressed then decompress it with:
 
 #+BEGIN_SRC bash
-ssh myusername@freedombone_IP_address
-su
-sudo apt-get update
-apt-get install git build-essential
-git clone https://github.com/bashrc/freedombone
-cd freedombone
-make install
-nano /home/myusername/freedombone/freedombone.cfg
+tar -xjvf filename.tar.bz2
 #+END_SRC
 
-Add the following, and set the values as needed. DEFAULT_DOMAIN_NAME is where your email/xmpp/irc/voip will be accessed from. It could be the same as one of your other domains, or separate.
+Then copy it to a microSD card. Depending on your system you may need an adaptor to be able to do that.
 
 #+BEGIN_SRC bash
-MY_USERNAME=myusername
-DEFAULT_DOMAIN_NAME=mywikidomain
-SYSTEM_TYPE=full
-INSTALLING_ON_BBB=no
-DDNS_PROVIDER=default@freedns.afraid.org
-DDNS_USERNAME=ddnsusername
-DDNS_PASSWORD=ddnspassword3471326
-MY_NAME=MyFullNameOrNick
-MY_EMAIL_ADDRESS=myusername@mywikidomain
-LOCAL_NETWORK_STATIC_IP_ADDRESS=192.168.1.60
-ROUTER_IP_ADDRESS=192.168.1.254
-ENABLE_CJDNS=no
-DEBIAN_REPO=ftp.us.debian.org
-NAMESERVER1=85.214.73.63
-NAMESERVER2=213.73.91.35
-WIKI_TITLE=my wiki title
-WIKI_DOMAIN_NAME=mywikidomain
-MY_BLOG_TITLE=my blog
-FULLBLOG_DOMAIN_NAME=myblogdomain
-MICROBLOG_DOMAIN_NAME=mymicroblogdomain
-HUBZILLA_DOMAIN_NAME=myhubzilladomain
-OWNCLOUD_DOMAIN_NAME=myownclouddomain
-HWRNG_TYPE=haveged
-ENABLE_SOCIAL_KEY_MANAGEMENT="no"
+sudo dd bs=1M if=filename.img of=/dev/sdX conv=fdatasync
 #+END_SRC
 
-Both of the IP addresses are local IP addresses, typically of the form 192.168.x.x, with one being for the system and the other being for the internet router.
+Where *sdX* is the microSD drive. You can check which drive is the microSD drive using:
 
-Save the configuration file and exit from your editor.
+#+BEGIN_SRC bash
+ls /dev/sd*
+#+END_SRC
+
+With the drive removed and inserted. Copying to the microSD will take a while, so go and do something less boring instead. When it's complete remove it from your system and insert it into the SBC. Connect an ethernet cable between the SBC and your internet router, then connect the power cable. On the Beaglebone Black you will see some flashing LEDs, but on other SBCs there may not be any visual indication that anything is booting.
 
-Now you can begin the installation. If you are doing this on a Beaglebone Black:
+With the board connected and running you can ssh into the system with:
 
 #+BEGIN_SRC bash
-freedombone -c freedombone.cfg
+ssh fbone@freedombone.local -p 2222
 #+END_SRC
 
-The above command should be run in the same directory in which your configuration file exists.
+Using the password 'freedombone'. Take a note of the new login password and then you can proceed through the rest of the installation.
 
-Also see the manpage for additional options which can be used instead of a configuration file.
+** As a Virtual Machine
 
-* Social Key Management
+Virtualbox and Qemu are supported. You can run a 64 bit Qemu image with:
+
+#+BEGIN_SRC bash
+qemu-system-x86_64 filename.img
+#+END_SRC
+
+If you are using Virtualbox then add a new VM and select the Freedombone *vdi* image.
+
+The default login will be username 'fbone' and password 'freedombone'. Take a note of the new login password and then you can proceed through the rest of the installation.
+
+* Social Key Management (aka 'The Unforgettable Key')
 If you are using the interactive installer then you will be aked if you wish to import GPG keys. If you don't already possess GPG keys then just select "Ok" and they will be generated during the install. If you do already have GPG keys then there are a few possibilities
 
 ** You have the gnupg keyring on an encrypted USB drive
@@ -147,15 +138,7 @@ If you previously made a master keydrive containing the full keyring (the .gnupg
 If you previously made some USB drives containing key fragments then retrieve them from your friends and plug them in one after the other. After the last drive has been read then remove it and just select "Ok". The system will then try to reconstruct the key. For this to work you will need to have previously made three or more [[Keydrives]].
 ** You can specify some ssh login details for friends servers containing key fragments
 Enter three or more sets of login details and the installer will try to retrieve key fragments and then assemble them into the full key. This only works if you previously were using remote backups and had social key management enabled.
-* Post-Setup
-Setup of the server and installation of all the relevant packages is not quick, and depends upon which variant you choose and your internet bandwidth. Allow about three hours for a full installation on the Beaglebone Black. On the Beaglebone installation is in two parts, since a reboot is needed to enable the hardware random number generator and zram.
-
-When done you can ssh into the Freedombone with:
-
-#+BEGIN_SRC bash
-ssh myusername@domain -p 2222
-#+END_SRC
-
+* Final Setup
 Any manual post-installation setup instructions or passwords can be found in /home/username/README. You should remove any passwords from that file and store them within a password manager such as KeepassX.
 
 On your internet router, typically under firewall settings, open the following ports and forward them to your server.

website/EN/installation.html

@@ -3,15 +3,15 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<title></title>
-<!-- 2015-11-03 Tue 19:49 -->
+<!-- 2015-12-03 Thu 12:09 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta  name="viewport" content="width=device-width, initial-scale=1" />
+<title></title>
 <meta  name="generator" content="Org-mode" />
 <meta  name="author" content="Bob Mottram" />
 <meta  name="description" content="Turn the Beaglebone Black into a personal communications server"
  />
 <meta  name="keywords" content="freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
-<meta  name="viewport" content="width=device-width, initial-scale=1" />
 <style type="text/css">
  <!--/*--><![CDATA[/*><!--*/
   .title  { text-align: center;
@@ -186,76 +186,72 @@ for the JavaScript code in this tag.
 <tbody>
 <tr>
 <td class="org-left"><a href="index.html">Home</a></td>
-<td class="org-left"><a href="#orgheadline1">Preparation for the Beaglebone Black</a></td>
+<td class="org-left"><a href="#orgheadline1">Building an image for an SBC or Virtual Machine</a></td>
 <td class="org-left"><a href="#orgheadline2">Checklist</a></td>
 <td class="org-left"><a href="./mesh.html">Mesh network</a></td>
-<td class="org-left"><a href="#orgheadline3">Interactive Setup</a></td>
-<td class="org-left"><a href="#orgheadline4">Non-Interactive Setup</a></td>
-<td class="org-left"><a href="#orgheadline5">Post-Setup</a></td>
+<td class="org-left"><a href="#orgheadline3">Installation</a></td>
+<td class="org-left"><a href="#orgheadline4">Social Key Management (aka 'The Unforgettable Key')</a></td>
+<td class="org-left"><a href="#orgheadline5">Final Setup</a></td>
 <td class="org-left"><a href="#orgheadline6">Keydrives</a></td>
 <td class="org-left"><a href="#orgheadline7">On Client Machines</a></td>
 </tr>
 </tbody>
 </table>
 
-
 <div id="outline-container-orgheadline1" class="outline-2">
-<h2 id="orgheadline1">Preparation for the Beaglebone Black</h2>
+<h2 id="orgheadline1">Building an image for an SBC or Virtual Machine</h2>
 <div class="outline-text-2" id="text-orgheadline1">
 <p>
-This section is specific to the Beaglebone Black hardware. If you're not using that hardware then just skip to the next section.
+You don't have to trust images downloaded from random internet locations signed with untrusted keys. You can build one from scratch yourself, and this is the recommended procedure for maximum security. For guidance on how to build images see the manpage for the <b>freedombone-image</b> command.
 </p>
 
 <p>
-To get started you will need:
+Install the freedombone commands onto your laptop/desktop:
 </p>
 
-<ul class="org-ul">
-<li>A Beaglebone Black</li>
-<li>A MicroSD card</li>
-<li>Ethernet cable</li>
-<li>Optionally a 5V 2A power supply for the Beaglebone Black</li>
-<li>Access to the internet via a router with ethernet sockets</li>
-<li>USB thumb drive (for backups or storing media)</li>
-<li>One or more domains available via a dynamic DNS provider, such as <a href="https://freedns.afraid.org/">https://freedns.afraid.org/</a></li>
-<li>A purchased domain name and SSL certificate (only needed for Hubzilla)</li>
-<li>A laptop or desktop machine with the ability to write to a microSD card (might need an adaptor)</li>
-</ul>
+<div class="org-src-container">
 
-<p>
-You will also need to know, or find out, the IP address of your internet router and have a suitable static IP address for the Beaglebone on your local network. The router should allow you to forward ports to the Beaglebone (often this is under firewall or "advanced" settings).
-</p>
+<pre class="src src-bash">sudo apt-get install git build-essential dialog
+git clone https://github.com/bashrc/freedombone
+<span class="org-builtin">cd</span> freedombone
+sudo make install
+</pre>
+</div>
 
 <p>
-You can either install from a debian package or manually as follows:
+Then install packages needed for building images:
 </p>
 
 <div class="org-src-container">
 
-<pre class="src src-bash">sudo apt-get update
-sudo apt-get install git dialog build-essential
-git clone https://github.com/bashrc/freedombone
-<span class="org-builtin">cd</span> freedombone
-sudo make install
+<pre class="src src-bash">sudo apt-get -y install python-docutils mktorrent vmdebootstrap
+sudo apt-get -y install dosfstools btrfs-tools extlinux python-distro-info mbr
+sudo apt-get -y install qemu-user-static binfmt-support u-boot-tools qemu
 </pre>
 </div>
 
 <p>
-Plug the microSD card into your laptop/desktop and then run the <b>freedombone-prep</b> command. For example:
+A typical use case to build an 8GB image for a Beaglebone Black is as follows. You can change the size depending upon the capacity of your microSD card.
 </p>
 
 <div class="org-src-container">
 
-<pre class="src src-bash">freedombone-prep -d /dev/sdX --ip freedombone_IP_address --iprouter router_IP_address
+<pre class="src src-bash">freedombone-image -t beaglebone -s 8G
 </pre>
 </div>
 
 <p>
-where /dev/sdX is the device name for the microSD card. Often it's /dev/sdb or /dev/sdc, depending upon how many drives there are on your system. The script will download the Debian installer and update the microSD card. It can take a while, so be patient.
+If you prefer an advanced installation with all of the options available then use:
 </p>
 
+<div class="org-src-container">
+
+<pre class="src src-bash">freedombone-image -t beaglebone -s 8G --minimal no
+</pre>
+</div>
+
 <p>
-When the initial setup is done follow the instructions on screen to run the main freedombone command.
+Other supported boards are cubieboard2, cubietruck and olinuxino-lime2.
 </p>
 </div>
 </div>
@@ -264,16 +260,15 @@ When the initial setup is done follow the instructions on screen to run the main
 <h2 id="orgheadline2">Checklist</h2>
 <div class="outline-text-2" id="text-orgheadline2">
 <p>
-Before running the freedombone command you will need a few things.
+Before installing Freedombone you will need a few things.
 </p>
 
 <ul class="org-ul">
 <li>Have some domains, or subdomains, registered with a dynamic DNS service</li>
-<li>System with a new installation of Debian Jessie</li>
-<li>Ethernet connection to an internet router</li>
-<li>It is possible to forward ports from the internet router to the system</li>
-<li>If you want to set up a social network or microblog then you will need SSL certificates corresponding to those domains</li>
-<li>Have ssh access to the system</li>
+<li>System with a new installation of Debian Jessie or a downloaded/prepared disk image</li>
+<li>Ethernet connection between the system and your internet router</li>
+<li>That it is possible to forward ports from the internet router to the system, typically via firewall settings</li>
+<li>Have ssh access to the system, typically via fbone@freedombone.local on port 2222</li>
 </ul>
 </div>
 </div>
@@ -286,152 +281,169 @@ If you are installing one of the mesh network variants then see <a href="./mesh.
 </div>
 </div>
 <div id="outline-container-orgheadline3" class="outline-2">
-<h2 id="orgheadline3">Interactive Setup</h2>
+<h2 id="orgheadline3">Installation</h2>
 <div class="outline-text-2" id="text-orgheadline3">
 <p>
-The interactive server configuration setup is recommended for most users. On the system where freedombone is to be installed create a configuration file.
+There are three install options: Laptop/Desktop/Netbook, SBC and Virtual Machine.
+</p>
+</div>
+
+<div id="outline-container-orgheadline9" class="outline-3">
+<h3 id="orgheadline9">On a Laptop, Netbook or Desktop machine</h3>
+<div class="outline-text-3" id="text-orgheadline9">
+<p>
+If you have an existing system, such as an old laptop or netbook which you can leave running as a server, then install a new version of Debian Jessie onto it. During the Debian install you won't need the print server or the desktop environment, and unchecking those will reduce the attack surface. Once Debian enter the following commands:
 </p>
 
 <div class="org-src-container">
 
-<pre class="src src-bash">ssh myusername@freedombone_IP_address
-su
-sudo apt-get update
-apt-get install git dialog build-essential
+<pre class="src src-bash">su
+apt-get update
+apt-get -y install git dialog build-essential
 git clone https://github.com/bashrc/freedombone
 <span class="org-builtin">cd</span> freedombone
 make install
+freedombone menuconfig
 </pre>
 </div>
+</div>
+</div>
+
+<div id="outline-container-orgheadline10" class="outline-3">
+<h3 id="orgheadline10">On a single board computer (SBC)</h3>
+<div class="outline-text-3" id="text-orgheadline10">
+<p>
+Currently the following boards are supported:
+</p>
+
+<p>
+<a href="http://beagleboard.org/BLACK">Beaglebone Black</a>
+<a href="http://linux-sunxi.org/Cubietech_Cubieboard2">Cubieboard 2</a>
+<a href="https://linux-sunxi.org/Cubietruck">Cubietruck (Cubieboard 3)</a>
+<a href="https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXIno-LIME2/open-source-hardware">olinuxino Lime2</a>
+</p>
 
 <p>
-Now the easiest way to install the system is via the interactive setup.
+If there is no existing image available then you can build one from scratch. See the section above on how to do that. If an existing image is available then you can download it and check the signature with:
 </p>
 
 <div class="org-src-container">
 
-<pre class="src src-bash">freedombone menuconfig
+<pre class="src src-bash">gpg --verify filename.img.asc
 </pre>
 </div>
 
 <p>
-You can select which variant you wish to install and then enter the details as requested. A video of the install sequence can be <a href="./installer.ogv">seen here</a>.
+And the hash with:
 </p>
-</div>
+
+<div class="org-src-container">
+
+<pre class="src src-bash">sha256sum filename.img
+</pre>
 </div>
 
-<div id="outline-container-orgheadline4" class="outline-2">
-<h2 id="orgheadline4">Non-Interactive Setup</h2>
-<div class="outline-text-2" id="text-orgheadline4">
 <p>
-If you don't want to install interactively then it's possible to manually create a configuration file as follows:
+If the image is compressed then decompress it with:
 </p>
 
+<div class="org-src-container">
+
+<pre class="src src-bash">tar -xjvf filename.tar.bz2
+</pre>
+</div>
+
 <p>
-On the system where freedombone is to be installed create a configuration file.
+Then copy it to a microSD card. Depending on your system you may need an adaptor to be able to do that.
 </p>
 
 <div class="org-src-container">
 
-<pre class="src src-bash">ssh myusername@freedombone_IP_address
-su
-sudo apt-get update
-apt-get install git build-essential
-git clone https://github.com/bashrc/freedombone
-<span class="org-builtin">cd</span> freedombone
-make install
-nano /home/myusername/freedombone/freedombone.cfg
+<pre class="src src-bash">sudo dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">if</span>=filename.img <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">conv</span>=fdatasync
 </pre>
 </div>
 
 <p>
-Add the following, and set the values as needed. DEFAULT_DOMAIN_NAME is where your email/xmpp/irc/voip will be accessed from. It could be the same as one of your other domains, or separate.
+Where <b>sdX</b> is the microSD drive. You can check which drive is the microSD drive using:
 </p>
 
 <div class="org-src-container">
 
-<pre class="src src-bash"><span class="org-variable-name">MY_USERNAME</span>=myusername
-<span class="org-variable-name">DEFAULT_DOMAIN_NAME</span>=mywikidomain
-<span class="org-variable-name">SYSTEM_TYPE</span>=full
-<span class="org-variable-name">INSTALLING_ON_BBB</span>=no
-<span class="org-variable-name">DDNS_PROVIDER</span>=default@freedns.afraid.org
-<span class="org-variable-name">DDNS_USERNAME</span>=ddnsusername
-<span class="org-variable-name">DDNS_PASSWORD</span>=ddnspassword3471326
-<span class="org-variable-name">MY_NAME</span>=MyFullNameOrNick
-<span class="org-variable-name">MY_EMAIL_ADDRESS</span>=myusername@mywikidomain
-<span class="org-variable-name">LOCAL_NETWORK_STATIC_IP_ADDRESS</span>=192.168.1.60
-<span class="org-variable-name">ROUTER_IP_ADDRESS</span>=192.168.1.254
-<span class="org-variable-name">ENABLE_CJDNS</span>=no
-<span class="org-variable-name">DEBIAN_REPO</span>=ftp.us.debian.org
-<span class="org-variable-name">NAMESERVER1</span>=85.214.73.63
-<span class="org-variable-name">NAMESERVER2</span>=213.73.91.35
-<span class="org-variable-name">WIKI_TITLE</span>=my wiki title
-<span class="org-variable-name">WIKI_DOMAIN_NAME</span>=mywikidomain
-<span class="org-variable-name">MY_BLOG_TITLE</span>=my blog
-<span class="org-variable-name">FULLBLOG_DOMAIN_NAME</span>=myblogdomain
-<span class="org-variable-name">MICROBLOG_DOMAIN_NAME</span>=mymicroblogdomain
-<span class="org-variable-name">HUBZILLA_DOMAIN_NAME</span>=myhubzilladomain
-<span class="org-variable-name">OWNCLOUD_DOMAIN_NAME</span>=myownclouddomain
-<span class="org-variable-name">HWRNG_TYPE</span>=haveged
-<span class="org-variable-name">ENABLE_SOCIAL_KEY_MANAGEMENT</span>=<span class="org-string">"no"</span>
+<pre class="src src-bash">ls /dev/sd*
 </pre>
 </div>
 
 <p>
-Both of the IP addresses are local IP addresses, typically of the form 192.168.x.x, with one being for the system and the other being for the internet router.
+With the drive removed and inserted. Copying to the microSD will take a while, so go and do something less boring instead. When it's complete remove it from your system and insert it into the SBC. Connect an ethernet cable between the SBC and your internet router, then connect the power cable. On the Beaglebone Black you will see some flashing LEDs, but on other SBCs there may not be any visual indication that anything is booting.
 </p>
 
 <p>
-Save the configuration file and exit from your editor.
+With the board connected and running you can ssh into the system with:
+</p>
+
+<div class="org-src-container">
+
+<pre class="src src-bash">ssh fbone@freedombone.local -p 2222
+</pre>
+</div>
+
+<p>
+Using the password 'freedombone'. Take a note of the new login password and then you can proceed through the rest of the installation.
 </p>
+</div>
+</div>
 
+<div id="outline-container-orgheadline11" class="outline-3">
+<h3 id="orgheadline11">As a Virtual Machine</h3>
+<div class="outline-text-3" id="text-orgheadline11">
 <p>
-Now you can begin the installation. If you are doing this on a Beaglebone Black:
+Virtualbox and Qemu are supported. You can run a 64 bit Qemu image with:
 </p>
 
 <div class="org-src-container">
 
-<pre class="src src-bash">freedombone -c freedombone.cfg
+<pre class="src src-bash">qemu-system-x86_64 filename.img
 </pre>
 </div>
 
 <p>
-The above command should be run in the same directory in which your configuration file exists.
+If you are using Virtualbox then add a new VM and select the Freedombone <b>vdi</b> image.
 </p>
 
 <p>
-Also see the manpage for additional options which can be used instead of a configuration file.
+The default login will be username 'fbone' and password 'freedombone'. Take a note of the new login password and then you can proceed through the rest of the installation.
 </p>
 </div>
 </div>
+</div>
 
-<div id="outline-container-orgheadline9" class="outline-2">
-<h2 id="orgheadline9">Social Key Management</h2>
-<div class="outline-text-2" id="text-orgheadline9">
+<div id="outline-container-orgheadline4" class="outline-2">
+<h2 id="orgheadline4">Social Key Management (aka 'The Unforgettable Key')</h2>
+<div class="outline-text-2" id="text-orgheadline4">
 <p>
 If you are using the interactive installer then you will be aked if you wish to import GPG keys. If you don't already possess GPG keys then just select "Ok" and they will be generated during the install. If you do already have GPG keys then there are a few possibilities
 </p>
 </div>
 
-<div id="outline-container-orgheadline10" class="outline-3">
-<h3 id="orgheadline10">You have the gnupg keyring on an encrypted USB drive</h3>
-<div class="outline-text-3" id="text-orgheadline10">
+<div id="outline-container-orgheadline12" class="outline-3">
+<h3 id="orgheadline12">You have the gnupg keyring on an encrypted USB drive</h3>
+<div class="outline-text-3" id="text-orgheadline12">
 <p>
 If you previously made a master keydrive containing the full keyring (the .gnupg directory). This is the most straightforward case, but not as secure as splitting the key into fragments.
 </p>
 </div>
 </div>
-<div id="outline-container-orgheadline11" class="outline-3">
-<h3 id="orgheadline11">You have a number of key fragments on USB drives retrieved from friends</h3>
-<div class="outline-text-3" id="text-orgheadline11">
+<div id="outline-container-orgheadline13" class="outline-3">
+<h3 id="orgheadline13">You have a number of key fragments on USB drives retrieved from friends</h3>
+<div class="outline-text-3" id="text-orgheadline13">
 <p>
 If you previously made some USB drives containing key fragments then retrieve them from your friends and plug them in one after the other. After the last drive has been read then remove it and just select "Ok". The system will then try to reconstruct the key. For this to work you will need to have previously made three or more <a href="#orgheadline6">Keydrives</a>.
 </p>
 </div>
 </div>
-<div id="outline-container-orgheadline12" class="outline-3">
-<h3 id="orgheadline12">You can specify some ssh login details for friends servers containing key fragments</h3>
-<div class="outline-text-3" id="text-orgheadline12">
+<div id="outline-container-orgheadline14" class="outline-3">
+<h3 id="orgheadline14">You can specify some ssh login details for friends servers containing key fragments</h3>
+<div class="outline-text-3" id="text-orgheadline14">
 <p>
 Enter three or more sets of login details and the installer will try to retrieve key fragments and then assemble them into the full key. This only works if you previously were using remote backups and had social key management enabled.
 </p>
@@ -439,23 +451,9 @@ Enter three or more sets of login details and the installer will try to retrieve
 </div>
 </div>
 <div id="outline-container-orgheadline5" class="outline-2">
-<h2 id="orgheadline5">Post-Setup</h2>
+<h2 id="orgheadline5">Final Setup</h2>
 <div class="outline-text-2" id="text-orgheadline5">
 <p>
-Setup of the server and installation of all the relevant packages is not quick, and depends upon which variant you choose and your internet bandwidth. Allow about three hours for a full installation on the Beaglebone Black. On the Beaglebone installation is in two parts, since a reboot is needed to enable the hardware random number generator and zram.
-</p>
-
-<p>
-When done you can ssh into the Freedombone with:
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-bash">ssh myusername@domain -p 2222
-</pre>
-</div>
-
-<p>
 Any manual post-installation setup instructions or passwords can be found in /home/username/README. You should remove any passwords from that file and store them within a password manager such as KeepassX.
 </p>
 
@@ -584,9 +582,9 @@ On your internet router, typically under firewall settings, open the following p
 After installing for the first time it's a good idea to create some keydrives. These will store your gpg key so that if all else fails you will still be able to restore from backup. There are two ways to do this:
 </p>
 </div>
-<div id="outline-container-orgheadline13" class="outline-3">
-<h3 id="orgheadline13">Master Keydrive</h3>
-<div class="outline-text-3" id="text-orgheadline13">
+<div id="outline-container-orgheadline15" class="outline-3">
+<h3 id="orgheadline15">Master Keydrive</h3>
+<div class="outline-text-3" id="text-orgheadline15">
 <p>
 This is the traditional security model in which you carry your full keyring on an encrypted USB drive. To make a master keydrive first format a USB drive as a LUKS encrypted drive. In Ubuntu this can be <a href="https://help.ubuntu.com/community/EncryptedFilesystemsOnRemovableStorage">done from the <i>Disk Utility</i> application</a>. Then plug it into the Freedombone system, then from your local machine run:
 </p>
@@ -604,9 +602,9 @@ Select <i>Backup and Restore</i> then <i>Backup GPG key to USB (master keydrive)
 </p>
 </div>
 </div>
-<div id="outline-container-orgheadline14" class="outline-3">
-<h3 id="orgheadline14">Fragment keydrives</h3>
-<div class="outline-text-3" id="text-orgheadline14">
+<div id="outline-container-orgheadline16" class="outline-3">
+<h3 id="orgheadline16">Fragment keydrives</h3>
+<div class="outline-text-3" id="text-orgheadline16">
 <p>
 This breaks your GPG key into a number of fragments and randomly selects one to add to the USB drive. First format a USB drive as a LUKS encrypted drive. In Ubuntu this <a href="https://help.ubuntu.com/community/EncryptedFilesystemsOnRemovableStorage">can be done from the <i>Disk Utility</i> application</a>. Plug it into the Freedombone system then from your local machine run the following commands:
 </p>