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

doc/EN/faq.org

@@ -20,6 +20,7 @@
 | [[What applications are supported?]]                                                          |
 | [[I don't have a static IP address. Can I still install this system?]]                        |
 | [[What are the best microSD cards to use?]]                                                   |
+| [[On a single board computer can I boot from an external SSD or hard drive?]]                 |
 | [[Why Freedombone and not FreedomBox?]]                                                       |
 | [[Why not support building images for Raspberry Pi?]]                                         |
 | [[Why use Tor? I've heard it's used by bad people]]                                           |
@@ -62,6 +63,22 @@ Yes. The minimum requirements are to have some hardware that you can install Deb
 The lack of a static IP address can be worked around by using a dynamic DNS service. Freedombone uses [[https://troglobit.com/inadyn.html][inadyn]] , which supports a variety of dynamic DNS providers.
 * What are the best microSD cards to use?
 There can be big differences in the performance of microSD cards, and the cheaper ones are almost invariably terrible and/or unusable. Sandisk and Samsung currently appear to be the better brands. You can find some performance benchmarks [[http://www.pidramble.com/wiki/benchmarks/microsd-cards][here]]. However, benchmarks like this only give a very rough idea of performance and they can vary significantly between individual cards even within the same brand.
+* On a single board computer can I boot from an external SSD or hard drive?
+Some single board computers, such as Cubieboards or OLinuxino, have a SATA socket on them which enables an external drive to be connected. This is usually intended for extra file storage, but it is also possible to run the operating system from an external drive. This can have the advantage of significantly increasing the read/write performance and your apps will appear to run more quickly.
+
+Typically a microSD read speed is 10-30MB/s. An SSD or hard drive can be 100MB/s or more, so that's a big potential gain.
+
+Single board computers usually don't have the capability of booting directly from an external drive, but what you can do is boot from a partition on a microSD drive, which then runs the main filesystem (the rootfs) from the external drive.
+
+To create an image suitable for running from an SSD or hard drive use the --sata option, such as:
+
+#+BEGIN_SRC bash
+freedombone-image -t cubieboard2 --sata sda2
+#+END_SRC
+
+Note that the sata option should be set to point to the second partition on the drive, which is normally sda2.
+
+When the image is created then use the dd command to copy it both to a microSD card and to the SSD or hard drive. Plug them both into the board and it should then boot and use the external drive.
 * Why Freedombone and not FreedomBox?
 When the project began in late 2013 the FreedomBox project seemed to be going nowhere, and was only designed to work with the DreamPlug hardware. There was some new hardware out - the Beaglebone Black - which could run Debian and was also a free hardware design so seemed more appropriate. Hence the name "Freedombone", being like FreedomBox but on a Beaglebone. There are some similarities and differences between the two projects:
 

doc/EN/homeserver.org

@@ -119,7 +119,7 @@ Use the password you wrote down earlier to log in. Select the *administrator con
 
 Then select *About*. You'll see a list of sites and their onion addresses.
 
-#+attr_html: :width 80% :align center
+#+attr_html: :width 100% :align center
 [[file:images/controlpanel/control_panel_about.jpg]]
 
 The About screen contains the ssh server public key hashes and you can compare the relevant one with the previous terminal window to verify that they're the same. If they're not then you might have a /machine-in-the-middle/ snooping on you.

doc/EN/mobile.org

@@ -9,37 +9,8 @@
 #+attr_html: :width 80% :height 10% :align center
 [[file:images/logo.png]]
 
-* Mobile
-
 Mobile phones are insecure devices, but they're regarded as being so essential to modern life that telling people not to use them isn't a viable option. Here are some recommendations on setting up a mobile phone (aka "smartphone") to work with Freedombone.
 
-#+BEGIN_EXPORT html
- <center>
- <table style="width:80%; border:0">
-  <tr>
-    <td><center><b><h3>Open</h3></b><br>Use a free and open source operating system. Open means more trustworthy</center></td>
-    <td><center><b><h3>Remove</h3></b><br>If there are any proprietary apps then remove or deactivate them</center></td>
-  </tr>
-  <tr>
-    <td><center><b><h3>Encrypt</h3></b><br>Make sure your phone is encrypted with a password which isn't easy to guess</center></td>
-    <td><center><b><h3>Apps</h3></b><br>Use F-droid to install new apps</center></td>
-  </tr>
-  <tr>
-    <td><center><b><h3>Lock</h3></b><br>Enable a lock screen with a maximum number of password guesses</center></td>
-    <td><center><b><h3>Onion</h3></b><br>Onion route your connections to avoid bulk metadata collection</center></td>
-  </tr>
-  <tr>
-    <td><center><b><h3>Email</h3></b><br>Access webmail in a browser</center></td>
-    <td><center><b><h3>Services</h3></b><br>Connect to the Freedombone services</center></td>
-  </tr>
-  <tr>
-    <td><center><b><h3>Battery</h3></b><br>Avoid battery-eating apps and disable some optimisations</center></td>
-    <td><center><b><h3>Block</h3></b><br>Prevent access to know bad domains</center></td>
-  </tr>
-</table>
-</center>
-#+END_EXPORT
-
 * Open
 Use a Linux based phone operating system. Typically this will mean Android, but could also mean LineageOS or Replicant. LineageOS is the most preferable, because you can usually get an up to date image with a recent kernel which will give you better security against exploits. If you're buying a phone then look for a model which is supported by LineageOS. Replicant is the most free (as in freedom) but only runs on a small number of phone models. If you have a phone which runs a full GNU/Linux system then that's fantastic, and you can probably use it in much the same way as a desktop system and the rest of the advice on this page won't apply. If you don't have a phone capable of running a Linux based operating system then consider selling, giving away or bartering your existing one.
 

src/freedombone-app-pleroma

@@ -36,7 +36,7 @@ PLEROMA_CODE=
 PLEROMA_PORT=4000
 PLEROMA_ONION_PORT=8011
 PLEROMA_REPO="https://git.pleroma.social/pleroma/pleroma.git"
-PLEROMA_COMMIT='e153b364a71de431787db236c57114f229162ddf'
+PLEROMA_COMMIT='fc6f5bcad3ad94eefbfcb24ca361e818ed0319d6'
 PLEROMA_ADMIN_PASSWORD=
 PLEROMA_DIR=/etc/pleroma
 PLEROMA_SECRET_KEY=""
@@ -724,6 +724,33 @@ function configure_interactive_pleroma {
     done
 }
 
+function pleroma_upgrade_tor {
+    pleroma_tor_update=
+
+    if ! grep -q '{:socks5, :localhost, 9050}' $pleroma_secret; then
+        pleroma_tor_update=1
+    fi
+
+    if ! grep -q '# config :pleroma, :http, proxy_url:' $PLEROMA_DIR/config/config.exs; then
+        pleroma_tor_update=1
+    fi
+
+    if [ ! $pleroma_tor_update ]; then
+        return
+    fi
+
+    if ! grep -q '{:socks5, :localhost, 9050}' $pleroma_secret; then
+        sed -i '/9050/d' $pleroma_secret
+        sed -i '/url:/a config :pleroma, :http, proxy_url: {:socks5, :localhost, 9050}' $pleroma_secret
+    fi
+
+    if ! grep -q '# config :pleroma, :http, proxy_url:' $PLEROMA_DIR/config/config.exs; then
+        sed -i 's|config :pleroma, :http, proxy_url:|# config :pleroma, :http, proxy_url:|g' $PLEROMA_DIR/config/config.exs
+    fi
+
+    pleroma_recompile
+}
+
 function upgrade_pleroma {
     read_config_param PLEROMA_DOMAIN_NAME
     read_config_param PLEROMA_EXPIRE_MONTHS
@@ -738,6 +765,8 @@ function upgrade_pleroma {
         create_pleroma_blocklist
     fi
 
+    pleroma_upgrade_tor
+
     CURR_PLEROMA_COMMIT=$(get_completion_param "pleroma commit")
     if [[ "$CURR_PLEROMA_COMMIT" == "$PLEROMA_COMMIT" ]]; then
         return
@@ -748,6 +777,11 @@ function upgrade_pleroma {
         pleroma_registrations=
     fi
 
+    pleroma_chat_enabled=1
+    if grep -q ':chat, enabled: false' $PLEROMA_DIR/config/config.exs; then
+        pleroma_chat_enabled=
+    fi
+
     # make a copy of the configuration
     cp $PLEROMA_DIR/priv/static/static/config.json $PLEROMA_DIR/priv/static/static/config_prev.json
 
@@ -780,6 +814,12 @@ function upgrade_pleroma {
         sed -i 's|registrations_open: True|registrations_open: false|g' $PLEROMA_DIR/config/config.exs
     fi
 
+    if [ ! $pleroma_chat_enabled ]; then
+        sed -i 's|config :pleroma, :chat.*|config :pleroma, :chat, enabled: false|g' $PLEROMA_DIR/config/config.exs
+    else
+        sed -i 's|config :pleroma, :chat.*|config :pleroma, :chat, enabled: true|g' $PLEROMA_DIR/config/config.exs
+    fi
+
     pleroma_recompile
 
     # migrate database
@@ -1252,6 +1292,10 @@ function install_pleroma {
     sed -i 's|redirect_on_failure:.*|redirect_on_failure: false|g' $PLEROMA_DIR/config/config.exs
     sed -i 's|:chat, enabled:.*|:chat, enabled: false|g' $PLEROMA_DIR/config/config.exs
 
+    # onion routing
+    sed -i '/url:/a config :pleroma, :http, proxy_url: {:socks5, :localhost, 9050}' $pleroma_secret
+    sed -i 's|config :pleroma, :http, proxy_url:|# config :pleroma, :http, proxy_url:|g' $PLEROMA_DIR/config/config.exs
+
     # set registrations open initially
     sed -i 's|registrations_open:.*|registrations_open: true,|g' $PLEROMA_DIR/config/config.exs
     sed -i 's|"registrationOpen":.*|"registrationOpen": true,|g' $PLEROMA_DIR/priv/static/static/config.json

src/freedombone-app-searx

@@ -35,6 +35,7 @@ SHOW_ICANN_ADDRESS_ON_ABOUT=0
 SEARX_REPO="https://github.com/asciimoo/searx"
 SEARX_COMMIT='80460be8f69cea5f15c9d5ddbb63e4e48fde2dd0'
 SEARX_PATH=/etc
+SEARX_PORT=8888
 SEARX_ONION_PORT=8094
 SEARX_ONION_HOSTNAME=
 SEARX_LOGIN_TEXT=$"Search engine login"
@@ -258,7 +259,7 @@ function create_searx_config {
       echo '    language : "all"';
       echo '';
       echo 'server:';
-      echo '    port : 8888';
+      echo "    port : ${SEARX_PORT}";
       echo '    bind_address : "127.0.0.1" # address to listen on';
       echo "    secret_key : \"${SEARX_SECRET_KEY}\"";
       echo "    base_url : http://${SEARX_ONION_HOSTNAME}/";
@@ -926,6 +927,7 @@ function install_searx {
     set_completion_param "searx commit" "$SEARX_COMMIT"
 
     # create an onion service
+    USE_V2_ONION_ADDRESS=1
     SEARX_ONION_HOSTNAME=$(add_onion_service searx 80 ${SEARX_ONION_PORT})
 
     # an unprivileged user to run as
@@ -965,7 +967,7 @@ function install_searx {
       echo '    location / {'; } >> /etc/nginx/sites-available/searx
     function_check nginx_limits
     nginx_limits searx '1M'
-    { echo '        proxy_pass http://localhost:8888;';
+    { echo "        proxy_pass http://localhost:${SEARX_PORT};";
       echo "        #auth_basic \"${SEARX_LOGIN_TEXT}\";";
       echo '        #auth_basic_user_file /etc/nginx/.htpasswd;';
       echo '    }';

src/freedombone-controlpanel

@@ -232,6 +232,12 @@ function show_domains {
         W+=("IPv6" "${ipv6_address}")
     fi
 
+    if [ -f /etc/ssh/ssh_host_rsa_key.pub ]; then
+        W+=("ssh rsa sha256" "$(awk '{print $2}' /etc/ssh/ssh_host_rsa_key.pub | base64 -d | sha256sum -b | awk '{print $1}' | xxd -r -p | base64 | sed 's|=||g')")
+    fi
+    if [ -f /etc/ssh/ssh_host_ed25519_key.pub ]; then
+        W+=("ssh ed25519 sha256" "$(awk '{print $2}' /etc/ssh/ssh_host_ed25519_key.pub | base64 -d | sha256sum -b | awk '{print $1}' | xxd -r -p | base64 | sed 's|=||g')")
+    fi
 
     if grep -q "ssh onion domain" "$COMPLETION_FILE"; then
         domain_onion=$(grep 'ssh onion domain' "${COMPLETION_FILE}" | awk -F ':' '{print $2}')
@@ -362,26 +368,10 @@ function show_tahoelafs {
     echo ''
 }
 
-function show_ssh_public_key {
-    echo $'SSH Public Keys'
-    echo '==============='
-    echo ''
-    get_ssh_server_key
-    echo ''
-    echo ''
-}
-
 function show_about {
     detect_apps
     get_apps_installed_names
-
-    #clear
-    #echo "==== ${PROJECT_NAME} version ${VERSION} ($DEBIAN_VERSION) ===="
-    #echo ''
-    #show_ssh_public_key
     show_domains
-    #show_users
-    #any_key
 }
 
 function select_user {
@@ -1808,13 +1798,17 @@ function performance_benchmarks {
 
     if [ ! -f /sbin/hdparm ]; then
         apt-get -yq install hdparm
-        clear
     fi
 
     test_drive=/dev/sda1
-    if [ -f /dev/mmcblk0 ]; then
-        test_drive=/dev/mmcblk0
+    if ! ls $test_drive; then
+        if ls /dev/mmcblk0p2; then
+            test_drive=/dev/mmcblk0p2
+        else
+            return
+        fi
     fi
+    clear
     echo ''
     echo $"Testing read speed of drive $test_drive"
     hdparm -tT $test_drive

src/freedombone-image

@@ -153,6 +153,10 @@ MULTIPATH_TOOLS_REPO="https://aur.archlinux.org/multipath-tools.git"
 MBR_REPO="https://aur.archlinux.org/mbr.git"
 CLIAPP_REPO="git://git.liw.fi/cliapp"
 
+# Whether to use a SATA drive and if so what its device/partition name is
+# eg. sda2
+EXTERNAL_DRIVE=
+
 function image_setup {
     setup_type=$1
 
@@ -453,6 +457,10 @@ do
             shift
             LOCAL_NAME="$1"
             ;;
+        --sata|--hdd)
+            shift
+            EXTERNAL_DRIVE="$1"
+            ;;
         *)
             # unknown option
             ;;
@@ -533,6 +541,10 @@ if [[ $ONION_ONLY != "no" ]]; then
     IMAGE_NAME=$'onion'
 fi
 
+if [ "$EXTERNAL_DRIVE" ]; then
+    IMAGE_NAME=$'sata'
+fi
+
 if [[ $VARIANT == 'mesh' ]]; then
     IMAGE_NAME=$'mesh'
     # typically not much disk space is needed for a mesh node
@@ -601,6 +613,7 @@ make "$IMAGE_TYPE" \
      INSECURE="$INSECURE" \
      AMNESIC="$AMNESIC" \
      SOCIALINSTANCE="$SOCIALINSTANCE" \
+     EXTERNAL_DRIVE="$EXTERNAL_DRIVE" \
      LOCAL_NAME="$LOCAL_NAME"
 
 # shellcheck disable=SC2181

src/freedombone-image-customise

@@ -141,6 +141,10 @@ BMX7_COMMIT='0a82c7c10fef44b259b35e77ab33632aa132d219'
 
 PATH=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin
 
+# Whether to use a SATA drive and if so what its device/partition name is
+# eg. sda2
+EXTERNAL_DRIVE=
+
 configure_backports() {
     echo "deb http://${DEBIAN_REPO}/debian/ ${DEBIAN_VERSION}-backports main" >> "$rootdir/etc/apt/sources.list"
 }

src/freedombone-image-hardware-setup

@@ -155,6 +155,10 @@ beaglebone_repack_kernel() {
 
 a20_setup_boot() {
     dtb="$1"
+    a20_root_device='mmcblk0p2'
+    if [ "$2" ]; then
+        a20_root_device="$2"
+    fi
 
     # Setup boot.cmd
     if grep -q btrfs /etc/fstab ; then
@@ -173,7 +177,7 @@ a20_setup_boot() {
 setenv mmcdev 0
 setenv mmcpart 1
 
-setenv mmcroot /dev/mmcblk0p2 ro
+setenv mmcroot /dev/${a20_root_device} ro
 setenv mmcrootfstype $fstype rootwait fixrtc
 setenv mmcrootflags subvol=@
 
@@ -239,27 +243,27 @@ case "$MACHINE" in
         enable_serial_console ttyO0
         ;;
     cubietruck)
-        a20_setup_boot sun7i-a20-cubietruck.dtb
+        a20_setup_boot sun7i-a20-cubietruck.dtb "$EXTERNAL_DRIVE"
         enable_serial_console ttyS0
         ;;
     a20-olinuxino-lime)
-        a20_setup_boot sun7i-a20-olinuxino-lime.dtb
+        a20_setup_boot sun7i-a20-olinuxino-lime.dtb "$EXTERNAL_DRIVE"
         enable_serial_console ttyS0
         ;;
     a20-olinuxino-lime2)
-        a20_setup_boot sun7i-a20-olinuxino-lime2.dtb
+        a20_setup_boot sun7i-a20-olinuxino-lime2.dtb "$EXTERNAL_DRIVE"
         enable_serial_console ttyS0
         ;;
     a20-olinuxino-micro)
-        a20_setup_boot sun7i-a20-olinuxino-micro.dtb
+        a20_setup_boot sun7i-a20-olinuxino-micro.dtb "$EXTERNAL_DRIVE"
         enable_serial_console ttyS0
         ;;
     cubieboard2)
-        a20_setup_boot sun7i-a20-cubieboard2.dtb
+        a20_setup_boot sun7i-a20-cubieboard2.dtb "$EXTERNAL_DRIVE"
         enable_serial_console ttyS0
         ;;
     pcduino3)
-        a20_setup_boot sun7i-a20-pcduino3.dtb
+        a20_setup_boot sun7i-a20-pcduino3.dtb "$EXTERNAL_DRIVE"
         enable_serial_console ttyS0
         ;;
 esac

src/freedombone-image-make

@@ -77,6 +77,7 @@ export INSECURE
 export AMNESIC
 export SOCIALINSTANCE
 export LOCAL_NAME
+export EXTERNAL_DRIVE
 
 # Locate vmdebootstrap program fetched in Makefile
 basedir=`pwd`
@@ -101,7 +102,7 @@ a20_pkgs="linux-image-armmp-lpae u-boot-tools u-boot u-boot-sunxi"
 # Packages needed for self-hosted development
 dev_pkgs="build-essential devscripts make man-db emacs org-mode git mercurial"
 
-echo Building "$MACHINE" "$PROJECT_NAME" for "$ARCHITECTURE".
+echo Building "$MACHINE" "$PROJECT_NAME" for "$ARCHITECTURE" "$EXTERNAL_DRIVE"
 
 case "$MACHINE" in
     beaglebone)
@@ -225,6 +226,7 @@ sed -i "s|INSECURE=.*|INSECURE=\"${INSECURE}\"|g" "$TEMP_CUSTOMISE3"
 sed -i "s|AMNESIC=.*|AMNESIC=\"${AMNESIC}\"|g" "$TEMP_CUSTOMISE3"
 sed -i "s|SOCIALINSTANCE=.*|SOCIALINSTANCE=\"${SOCIALINSTANCE}\"|g" "$TEMP_CUSTOMISE3"
 sed -i "s|LOCAL_NAME=.*|LOCAL_NAME=\"${LOCAL_NAME}\"|g" "$TEMP_CUSTOMISE3"
+sed -i "s|EXTERNAL_DRIVE=.*|EXTERNAL_DRIVE=\"${EXTERNAL_DRIVE}\"|g" "$TEMP_CUSTOMISE3"
 sed -i 's|#!/bin/bash||g' "$TEMP_CUSTOMISE3"
 
 cat $TEMP_CUSTOMISE2 $TEMP_CUSTOMISE3 > $TEMP_CUSTOMISE4
@@ -254,6 +256,7 @@ sudo -H \
      ARCHITECTURE="$ARCHITECTURE" \
      SOURCE="$SOURCE" \
      CUSTOM_SETUP="$CUSTOM_SETUP" \
+     EXTERNAL_DRIVE="$EXTERNAL_DRIVE" \
      $VMDEBOOTSTRAP \
      --log "$(dirname "$IMAGE")/${PROJECT_NAME}.log" \
      --log-level debug \

src/freedombone-utils-web

@@ -88,11 +88,11 @@ function nginx_limits {
         max_body=$2
     fi
     filename=/etc/nginx/sites-available/$domain_name
-    { echo "    client_max_body_size ${max_body};";
-      echo '    client_body_buffer_size 128k;';
+    { echo "        client_max_body_size ${max_body};";
+      echo '        client_body_buffer_size 128k;';
       echo '';
-      echo '    limit_conn conn_limit_per_ip 10;';
-      echo '    limit_req zone=req_limit_per_ip burst=10 nodelay;';
+      echo '        limit_conn conn_limit_per_ip 10;';
+      echo '        limit_req zone=req_limit_per_ip burst=10 nodelay;';
       echo ''; } >> "$filename"
 }
 

website/EN/faq.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>
-<!-- 2018-04-21 Sat 17:21 -->
+<!-- 2018-04-22 Sun 17:22 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>&lrm;</title>
@@ -262,155 +262,159 @@ for the JavaScript code in this tag.
 </colgroup>
 <tbody>
 <tr>
-<td class="org-left"><a href="#org9ac9dc9">What applications are supported?</a></td>
+<td class="org-left"><a href="#org9d9db8e">What applications are supported?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org57cb5f7">I don't have a static IP address. Can I still install this system?</a></td>
+<td class="org-left"><a href="#orgb7afc6a">I don't have a static IP address. Can I still install this system?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org2ec231a">What are the best microSD cards to use?</a></td>
+<td class="org-left"><a href="#org65c636f">What are the best microSD cards to use?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgf562031">Why Freedombone and not FreedomBox?</a></td>
+<td class="org-left"><a href="#orgeeb7892">On a single board computer can I boot from an external SSD or hard drive?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgba4b2dc">Why not support building images for Raspberry Pi?</a></td>
+<td class="org-left"><a href="#orgb396274">Why Freedombone and not FreedomBox?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org8b22f5c">Why use Tor? I've heard it's used by bad people</a></td>
+<td class="org-left"><a href="#orgfced681">Why not support building images for Raspberry Pi?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgbaa6623">How is Tor integrated with Freedombone?</a></td>
+<td class="org-left"><a href="#org3077cce">Why use Tor? I've heard it's used by bad people</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgbd702fd">Can I add a clearnet domain to an onion build?</a></td>
+<td class="org-left"><a href="#org3552fe9">How is Tor integrated with Freedombone?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org4d09a2a">Why use Github?</a></td>
+<td class="org-left"><a href="#org6742965">Can I add a clearnet domain to an onion build?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org82e9020">After using nmap or other scanning tool I can no longer log in</a></td>
+<td class="org-left"><a href="#orga8ad014">Why use Github?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org6838add">Should I upload my GPG keys to keybase.io?</a></td>
+<td class="org-left"><a href="#orgbe6f7d6">After using nmap or other scanning tool I can no longer log in</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgefe80fb">Keys and emails should not be stored on servers. Why do you do that?</a></td>
+<td class="org-left"><a href="#orgccf9366">Should I upload my GPG keys to keybase.io?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org7659367">Why can't I access my .onion site with a Tor browser?</a></td>
+<td class="org-left"><a href="#orgb40484c">Keys and emails should not be stored on servers. Why do you do that?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org2bbb18a">What is the best hardware to run this system on?</a></td>
+<td class="org-left"><a href="#org20ae1ad">Why can't I access my .onion site with a Tor browser?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org15ecda8">Can I add more users to the system?</a></td>
+<td class="org-left"><a href="#org31eab79">What is the best hardware to run this system on?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgc47b161">Why not use Signal for mobile chat?</a></td>
+<td class="org-left"><a href="#orge1f68c9">Can I add more users to the system?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgc0e8c86">What is the most secure chat app to use on mobile?</a></td>
+<td class="org-left"><a href="#orgcd439e3">Why not use Signal for mobile chat?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org444799d">How do I remove a user from the system?</a></td>
+<td class="org-left"><a href="#orgfa7c5c1">What is the most secure chat app to use on mobile?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgc9b4ece">Why is logging for web sites turned off by default?</a></td>
+<td class="org-left"><a href="#org655d4c9">How do I remove a user from the system?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orge930cc5">How do I reset the tripwire?</a></td>
+<td class="org-left"><a href="#org70bc219">Why is logging for web sites turned off by default?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org0947e5a">Is metadata protected?</a></td>
+<td class="org-left"><a href="#org2649234">How do I reset the tripwire?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgb32e5cb">How do I create email processing rules?</a></td>
+<td class="org-left"><a href="#orgfdfefa3">Is metadata protected?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgcc703f1">Why isn't dynamic DNS working?</a></td>
+<td class="org-left"><a href="#org4cd4d7a">How do I create email processing rules?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgdb2c631">How do I change my encryption settings?</a></td>
+<td class="org-left"><a href="#orgccba878">Why isn't dynamic DNS working?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org748c030">How do I get a domain name?</a></td>
+<td class="org-left"><a href="#org2bd511f">How do I change my encryption settings?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org20d848a">How do I get a "real" SSL/TLS/HTTPS certificate?</a></td>
+<td class="org-left"><a href="#orgcc9b703">How do I get a domain name?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org364e5b4">How do I renew a Let's Encrypt certificate?</a></td>
+<td class="org-left"><a href="#org221b34b">How do I get a "real" SSL/TLS/HTTPS certificate?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org92cc380">I tried to renew a Let's Encrypt certificate and it failed. What should I do?</a></td>
+<td class="org-left"><a href="#org0180711">How do I renew a Let's Encrypt certificate?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org7fdf511">Why not use the services of $company instead? They took the Seppuku pledge</a></td>
+<td class="org-left"><a href="#org019cece">I tried to renew a Let's Encrypt certificate and it failed. What should I do?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org2ac01d7">Why does my email keep getting rejected as spam by Gmail/etc?</a></td>
+<td class="org-left"><a href="#orge3b3f79">Why not use the services of $company instead? They took the Seppuku pledge</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orga441aa1">Tor is censored/blocked in my area. What can I do?</a></td>
+<td class="org-left"><a href="#orga476817">Why does my email keep getting rejected as spam by Gmail/etc?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgaf2f408">I want to block a particular domain from getting its content into my social network sites</a></td>
+<td class="org-left"><a href="#orgebcf081">Tor is censored/blocked in my area. What can I do?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgf5fd6ee">The mesh system doesn't boot from USB drive</a></td>
+<td class="org-left"><a href="#org97fe227">I want to block a particular domain from getting its content into my social network sites</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org4b55e47">Mesh system doesn't connect to the network</a></td>
+<td class="org-left"><a href="#org5b978bf">The mesh system doesn't boot from USB drive</a></td>
+</tr>
+
+<tr>
+<td class="org-left"><a href="#orgf1d3c97">Mesh system doesn't connect to the network</a></td>
 </tr>
 </tbody>
 </table>
 </div>
 
-<div id="outline-container-org9ac9dc9" class="outline-2">
-<h2 id="org9ac9dc9">What applications are supported?</h2>
-<div class="outline-text-2" id="text-org9ac9dc9">
+<div id="outline-container-org9d9db8e" class="outline-2">
+<h2 id="org9d9db8e">What applications are supported?</h2>
+<div class="outline-text-2" id="text-org9d9db8e">
 <p>
 <a href="./apps.html">See here</a> for the complete list of apps. In addition to those as part of the base install you get an email server.
 </p>
 </div>
 </div>
-<div id="outline-container-org57cb5f7" class="outline-2">
-<h2 id="org57cb5f7">I don't have a static IP address. Can I still install this system?</h2>
-<div class="outline-text-2" id="text-org57cb5f7">
+<div id="outline-container-orgb7afc6a" class="outline-2">
+<h2 id="orgb7afc6a">I don't have a static IP address. Can I still install this system?</h2>
+<div class="outline-text-2" id="text-orgb7afc6a">
 <p>
 Yes. The minimum requirements are to have some hardware that you can install Debian onto and also that you have administrator access to your internet router so that you can forward ports to the system which has Freedombone installed.
 </p>
@@ -420,25 +424,58 @@ The lack of a static IP address can be worked around by using a dynamic DNS serv
 </p>
 </div>
 </div>
-<div id="outline-container-org2ec231a" class="outline-2">
-<h2 id="org2ec231a">What are the best microSD cards to use?</h2>
-<div class="outline-text-2" id="text-org2ec231a">
+<div id="outline-container-org65c636f" class="outline-2">
+<h2 id="org65c636f">What are the best microSD cards to use?</h2>
+<div class="outline-text-2" id="text-org65c636f">
 <p>
 There can be big differences in the performance of microSD cards, and the cheaper ones are almost invariably terrible and/or unusable. Sandisk and Samsung currently appear to be the better brands. You can find some performance benchmarks <a href="http://www.pidramble.com/wiki/benchmarks/microsd-cards">here</a>. However, benchmarks like this only give a very rough idea of performance and they can vary significantly between individual cards even within the same brand.
 </p>
 </div>
 </div>
-<div id="outline-container-orgf562031" class="outline-2">
-<h2 id="orgf562031">Why Freedombone and not FreedomBox?</h2>
-<div class="outline-text-2" id="text-orgf562031">
+<div id="outline-container-orgeeb7892" class="outline-2">
+<h2 id="orgeeb7892">On a single board computer can I boot from an external SSD or hard drive?</h2>
+<div class="outline-text-2" id="text-orgeeb7892">
+<p>
+Some single board computers, such as Cubieboards or OLinuxino, have a SATA socket on them which enables an external drive to be connected. This is usually intended for extra file storage, but it is also possible to run the operating system from an external drive. This can have the advantage of significantly increasing the read/write performance and your apps will appear to run more quickly.
+</p>
+
+<p>
+Typically a microSD read speed is 10-30MB/s. An SSD or hard drive can be 100MB/s or more, so that's a big potential gain.
+</p>
+
+<p>
+Single board computers usually don't have the capability of booting directly from an external drive, but what you can do is boot from a partition on a microSD drive, which then runs the main filesystem (the rootfs) from the external drive.
+</p>
+
+<p>
+To create an image suitable for running from an SSD or hard drive use the &#x2013;sata option, such as:
+</p>
+
+<div class="org-src-container">
+<pre class="src src-bash">freedombone-image -t cubieboard2 --sata sda2
+</pre>
+</div>
+
+<p>
+Note that the sata option should be set to point to the second partition on the drive, which is normally sda2.
+</p>
+
+<p>
+When the image is created then use the dd command to copy it both to a microSD card and to the SSD or hard drive. Plug them both into the board and it should then boot and use the external drive.
+</p>
+</div>
+</div>
+<div id="outline-container-orgb396274" class="outline-2">
+<h2 id="orgb396274">Why Freedombone and not FreedomBox?</h2>
+<div class="outline-text-2" id="text-orgb396274">
 <p>
 When the project began in late 2013 the FreedomBox project seemed to be going nowhere, and was only designed to work with the DreamPlug hardware. There was some new hardware out - the Beaglebone Black - which could run Debian and was also a free hardware design so seemed more appropriate. Hence the name "Freedombone", being like FreedomBox but on a Beaglebone. There are some similarities and differences between the two projects:
 </p>
 </div>
 
-<div id="outline-container-org973e1fe" class="outline-3">
-<h3 id="org973e1fe">Similarities</h3>
-<div class="outline-text-3" id="text-org973e1fe">
+<div id="outline-container-orgb657b46" class="outline-3">
+<h3 id="orgb657b46">Similarities</h3>
+<div class="outline-text-3" id="text-orgb657b46">
 <ul class="org-ul">
 <li>Uses freedom-maker and vmdebootstrap to build debian images</li>
 <li>Supports the use of Tor onion addresses to access websites</li>
@@ -452,9 +489,9 @@ When the project began in late 2013 the FreedomBox project seemed to be going no
 </ul>
 </div>
 </div>
-<div id="outline-container-org54e398b" class="outline-3">
-<h3 id="org54e398b">Differences</h3>
-<div class="outline-text-3" id="text-org54e398b">
+<div id="outline-container-orga534499" class="outline-3">
+<h3 id="orga534499">Differences</h3>
+<div class="outline-text-3" id="text-orga534499">
 <ul class="org-ul">
 <li>FreedomBox is a Debian pure blend. Freedombone is not</li>
 <li>Freedombone only supports Free Software. FreedomBox includes some closed binary boot blobs for certain ARM boards</li>
@@ -469,9 +506,9 @@ When the project began in late 2013 the FreedomBox project seemed to be going no
 </div>
 </div>
 </div>
-<div id="outline-container-orgba4b2dc" class="outline-2">
-<h2 id="orgba4b2dc">Why not support building images for Raspberry Pi?</h2>
-<div class="outline-text-2" id="text-orgba4b2dc">
+<div id="outline-container-orgfced681" class="outline-2">
+<h2 id="orgfced681">Why not support building images for Raspberry Pi?</h2>
+<div class="outline-text-2" id="text-orgfced681">
 <p>
 The FreedomBox project supports Raspberry Pi builds, and the image build system for Freedombone is based on the same system. However, although the Raspberry Pi can run a version of Debian it requires a closed proprietary blob in order to boot the hardware. Who knows what that blob might contain or what exploits it could facilitate. From an adversarial point of view if you were trying to deliver "bulk equipment interference" then it doesn't get any better than piggybacking on something which has control of the boot process, and hence all subsequently run processes.
 </p>
@@ -481,9 +518,9 @@ So although the Raspberry Pi is cheap and hugely popular it's not supported by t
 </p>
 </div>
 </div>
-<div id="outline-container-org8b22f5c" class="outline-2">
-<h2 id="org8b22f5c">Why use Tor? I've heard it's used by bad people</h2>
-<div class="outline-text-2" id="text-org8b22f5c">
+<div id="outline-container-org3077cce" class="outline-2">
+<h2 id="org3077cce">Why use Tor? I've heard it's used by bad people</h2>
+<div class="outline-text-2" id="text-org3077cce">
 <p>
 Years ago Tor was usually depicted in the mainstream media as something scary inhabited by cyberterrorists and other bad cybers, but today to a large extent Tor is accepted as just another way of routing data in a network. Depending upon where you live there may still be some amount of fearmongering about Tor, but it now seems clear that the trajectory is towards general acceptance.
 </p>
@@ -504,9 +541,9 @@ On the negative side it's a complex system which is not fully decentralized.
 </p>
 </div>
 </div>
-<div id="outline-container-orgbaa6623" class="outline-2">
-<h2 id="orgbaa6623">How is Tor integrated with Freedombone?</h2>
-<div class="outline-text-2" id="text-orgbaa6623">
+<div id="outline-container-org3552fe9" class="outline-2">
+<h2 id="org3552fe9">How is Tor integrated with Freedombone?</h2>
+<div class="outline-text-2" id="text-org3552fe9">
 <p>
 Within this project Tor is used more to provide <i>accessibility</i> than the <i>anonymity</i> factor for which Tor is better known. The onion address system provides a way of being able to access sites even if you don't own a conventional domain name or don't have administrator access to your local internet router to be able to do port forwarding.
 </p>
@@ -524,17 +561,17 @@ Even if you're running the "onion only" build, this only means that sites are ac
 </p>
 </div>
 </div>
-<div id="outline-container-orgbd702fd" class="outline-2">
-<h2 id="orgbd702fd">Can I add a clearnet domain to an onion build?</h2>
-<div class="outline-text-2" id="text-orgbd702fd">
+<div id="outline-container-org6742965" class="outline-2">
+<h2 id="org6742965">Can I add a clearnet domain to an onion build?</h2>
+<div class="outline-text-2" id="text-org6742965">
 <p>
 You could if you manually edited the relevant nginx configuration files and installed some dynamic DNS system yourself. If you already have sysadmin knowledge then that's probably not too hard. But the builds created with the <b>onion-addresses-only</b> option aren't really intended to support access via clearnet domains.
 </p>
 </div>
 </div>
-<div id="outline-container-org4d09a2a" class="outline-2">
-<h2 id="org4d09a2a">Why use Github?</h2>
-<div class="outline-text-2" id="text-org4d09a2a">
+<div id="outline-container-orga8ad014" class="outline-2">
+<h2 id="orga8ad014">Why use Github?</h2>
+<div class="outline-text-2" id="text-orga8ad014">
 <p>
 Github is paradoxically a centralized, closed and proprietary system which happens to mostly host free and open source projects. Up until now it has been relatively benign, but at some point in the name of "growth" it will likely start becoming more evil, or just become like SourceForge - which was also once much loved by FOSS developers, but turned into a den of malvertizing.
 </p>
@@ -552,17 +589,17 @@ Currently many of the repositories used for applications which are not yet packa
 </p>
 </div>
 </div>
-<div id="outline-container-org82e9020" class="outline-2">
-<h2 id="org82e9020">After using nmap or other scanning tool I can no longer log in</h2>
-<div class="outline-text-2" id="text-org82e9020">
+<div id="outline-container-orgbe6f7d6" class="outline-2">
+<h2 id="orgbe6f7d6">After using nmap or other scanning tool I can no longer log in</h2>
+<div class="outline-text-2" id="text-orgbe6f7d6">
 <p>
 This system tries to block port scanners. Any other system trying to scan for open ports will have their IP address added to a temporary block list for 24 hours.
 </p>
 </div>
 </div>
-<div id="outline-container-org6838add" class="outline-2">
-<h2 id="org6838add">Should I upload my GPG keys to keybase.io?</h2>
-<div class="outline-text-2" id="text-org6838add">
+<div id="outline-container-orgccf9366" class="outline-2">
+<h2 id="orgccf9366">Should I upload my GPG keys to keybase.io?</h2>
+<div class="outline-text-2" id="text-orgccf9366">
 <p>
 It's not recommended unless there exists some compelling reason for you to be on there. That site asks users to upload the <b>private keys</b>, and even if the keys are client side encrypted with a passphrase there's always the chance that there will be a data leak in future and letter agencies will then have a full time opportunity to crack the passphrases.
 </p>
@@ -572,9 +609,9 @@ Saying something resembling <i>"only noobs will use crackable private key passph
 </p>
 </div>
 </div>
-<div id="outline-container-orgefe80fb" class="outline-2">
-<h2 id="orgefe80fb">Keys and emails should not be stored on servers. Why do you do that?</h2>
-<div class="outline-text-2" id="text-orgefe80fb">
+<div id="outline-container-orgb40484c" class="outline-2">
+<h2 id="orgb40484c">Keys and emails should not be stored on servers. Why do you do that?</h2>
+<div class="outline-text-2" id="text-orgb40484c">
 <p>
 Ordinarily this is good advice. However, the threat model for a device in your home is different from the one for a generic server in a massive warehouse. Compare and contrast:
 </p>
@@ -632,9 +669,9 @@ In the home environment a box with a good firewall and no GUI components install
 </div>
 </div>
 
-<div id="outline-container-org7659367" class="outline-2">
-<h2 id="org7659367">Why can't I access my .onion site with a Tor browser?</h2>
-<div class="outline-text-2" id="text-org7659367">
+<div id="outline-container-org20ae1ad" class="outline-2">
+<h2 id="org20ae1ad">Why can't I access my .onion site with a Tor browser?</h2>
+<div class="outline-text-2" id="text-org20ae1ad">
 <p>
 Probably you need to add the site to the NoScript whitelist. Typically click/press on the noscript icon (or select from the menu on mobile) then select <i>whitelist</i> and add the site URL. You may also need to disable HTTPS Everywhere when using onion addresses, which don't use https.
 </p>
@@ -644,9 +681,9 @@ Another factor to be aware of is that it can take a while for the onion address
 </p>
 </div>
 </div>
-<div id="outline-container-org2bbb18a" class="outline-2">
-<h2 id="org2bbb18a">What is the best hardware to run this system on?</h2>
-<div class="outline-text-2" id="text-org2bbb18a">
+<div id="outline-container-org31eab79" class="outline-2">
+<h2 id="org31eab79">What is the best hardware to run this system on?</h2>
+<div class="outline-text-2" id="text-org31eab79">
 <p>
 It was originally designed to run on the Beaglebone Black, but that should be regarded as the most minimal system, because it's single core and has by today's standards a small amount of memory. Obviously the more powerful the hardware is the faster things like web pages (blog, social networking, etc) will be served but the more electricity such a system will require if you're running it 24/7. A good compromise between performance and energy consumption is something like an old netbook. The battery of an old netbook or laptop even gives you <a href="https://en.wikipedia.org/wiki/Uninterruptible_power_supply">UPS capability</a> to keep the system going during brief power outages or cable re-arrangements, and that means using full disk encryption on the server also becomes more practical.
 </p>
@@ -656,9 +693,9 @@ It was originally designed to run on the Beaglebone Black, but that should be re
 </p>
 </div>
 </div>
-<div id="outline-container-org15ecda8" class="outline-2">
-<h2 id="org15ecda8">Can I add more users to the system?</h2>
-<div class="outline-text-2" id="text-org15ecda8">
+<div id="outline-container-orge1f68c9" class="outline-2">
+<h2 id="orge1f68c9">Can I add more users to the system?</h2>
+<div class="outline-text-2" id="text-orge1f68c9">
 <p>
 Yes. Freedombone can support a small number of users, for a "<i>friends and family</i>" type of home installation. This gives them access to an email account, XMPP, SIP phone and the blog (depending on whether the variant which you installed includes those).
 </p>
@@ -681,9 +718,9 @@ Another point is that Freedombone installations are not intended to support many
 </p>
 </div>
 </div>
-<div id="outline-container-orgc47b161" class="outline-2">
-<h2 id="orgc47b161">Why not use Signal for mobile chat?</h2>
-<div class="outline-text-2" id="text-orgc47b161">
+<div id="outline-container-orgcd439e3" class="outline-2">
+<h2 id="orgcd439e3">Why not use Signal for mobile chat?</h2>
+<div class="outline-text-2" id="text-orgcd439e3">
 <p>
 Celebrities recommend Signal. It's Free Software so it must be good, right?
 </p>
@@ -706,9 +743,9 @@ To give credit where it's due Signal is good, but it could be a lot better. The
 </p>
 </div>
 </div>
-<div id="outline-container-orgc0e8c86" class="outline-2">
-<h2 id="orgc0e8c86">What is the most secure chat app to use on mobile?</h2>
-<div class="outline-text-2" id="text-orgc0e8c86">
+<div id="outline-container-orgfa7c5c1" class="outline-2">
+<h2 id="orgfa7c5c1">What is the most secure chat app to use on mobile?</h2>
+<div class="outline-text-2" id="text-orgfa7c5c1">
 <p>
 On mobile there are various options. The apps which are likely to be most secure are ones which have end-to-end encryption enabled by default and which can also be onion routed via Orbot. End-to-end encryption secures the content of the message and onion routing obscures the metadata, making it hard for a passive adversary to know who is communicating with who.
 </p>
@@ -718,13 +755,13 @@ The current safest way to chat is to use <a href="https://conversations.im">Conv
 </p>
 
 <p>
-There are many <a href="#orgc47b161">other fashionable chat apps</a> with end-to-end security, but often they are closed source, have a single central server or can't be onion routed. It's also important to remember that closed source chat apps should be assumed to be untrustworthy, since their security cannot be independently verified.
+There are many <a href="#orgcd439e3">other fashionable chat apps</a> with end-to-end security, but often they are closed source, have a single central server or can't be onion routed. It's also important to remember that closed source chat apps should be assumed to be untrustworthy, since their security cannot be independently verified.
 </p>
 </div>
 </div>
-<div id="outline-container-org444799d" class="outline-2">
-<h2 id="org444799d">How do I remove a user from the system?</h2>
-<div class="outline-text-2" id="text-org444799d">
+<div id="outline-container-org655d4c9" class="outline-2">
+<h2 id="org655d4c9">How do I remove a user from the system?</h2>
+<div class="outline-text-2" id="text-org655d4c9">
 <p>
 To remove a user:
 </p>
@@ -739,9 +776,9 @@ Select <i>Administrator controls</i> then <i>Manage Users</i> and then <i>Delete
 </p>
 </div>
 </div>
-<div id="outline-container-orgc9b4ece" class="outline-2">
-<h2 id="orgc9b4ece">Why is logging for web sites turned off by default?</h2>
-<div class="outline-text-2" id="text-orgc9b4ece">
+<div id="outline-container-org70bc219" class="outline-2">
+<h2 id="org70bc219">Why is logging for web sites turned off by default?</h2>
+<div class="outline-text-2" id="text-org70bc219">
 <p>
 If you're making profits out of the logs by running large server warehouses and then data mining what users click on - as is the business model of well known internet companies - then logging everything makes total sense. However, if you're running a home server then logging really only makes sense if you're trying to diagnose some specific problem with the system, and outside of that context logging everything becomes more of a liability than an asset.
 </p>
@@ -755,9 +792,9 @@ On the Freedombone system web logs containing IP addresses are turned off by def
 </p>
 </div>
 </div>
-<div id="outline-container-orge930cc5" class="outline-2">
-<h2 id="orge930cc5">How do I reset the tripwire?</h2>
-<div class="outline-text-2" id="text-orge930cc5">
+<div id="outline-container-org2649234" class="outline-2">
+<h2 id="org2649234">How do I reset the tripwire?</h2>
+<div class="outline-text-2" id="text-org2649234">
 <p>
 The tripwire will be automatically reset once per week. If you want to reset it earlier then do the following:
 </p>
@@ -772,9 +809,9 @@ Select <i>Administrator controls</i> then "reset tripwire" using cursors and spa
 </p>
 </div>
 </div>
-<div id="outline-container-org0947e5a" class="outline-2">
-<h2 id="org0947e5a">Is metadata protected?</h2>
-<div class="outline-text-2" id="text-org0947e5a">
+<div id="outline-container-orgfdfefa3" class="outline-2">
+<h2 id="orgfdfefa3">Is metadata protected?</h2>
+<div class="outline-text-2" id="text-orgfdfefa3">
 <blockquote>
 <p>
 "<i>We kill people based on metadata</i>"
@@ -790,9 +827,9 @@ Even when using Freedombone metadata analysis by third parties is still possible
 </p>
 </div>
 </div>
-<div id="outline-container-orgb32e5cb" class="outline-2">
-<h2 id="orgb32e5cb">How do I create email processing rules?</h2>
-<div class="outline-text-2" id="text-orgb32e5cb">
+<div id="outline-container-org4cd4d7a" class="outline-2">
+<h2 id="org4cd4d7a">How do I create email processing rules?</h2>
+<div class="outline-text-2" id="text-org4cd4d7a">
 <div class="org-src-container">
 <pre class="src src-bash">ssh username@domainname -p 2222
 </pre>
@@ -848,9 +885,9 @@ Spamassassin is also available and within Mutt you can use the S (shift+s) key t
 </p>
 </div>
 </div>
-<div id="outline-container-orgcc703f1" class="outline-2">
-<h2 id="orgcc703f1">Why isn't dynamic DNS working?</h2>
-<div class="outline-text-2" id="text-orgcc703f1">
+<div id="outline-container-orgccba878" class="outline-2">
+<h2 id="orgccba878">Why isn't dynamic DNS working?</h2>
+<div class="outline-text-2" id="text-orgccba878">
 <p>
 If you run the command:
 </p>
@@ -873,9 +910,9 @@ https://www.privateinternetaccess.com/pages/whats-my-ip/
 </div>
 </div>
 
-<div id="outline-container-orgdb2c631" class="outline-2">
-<h2 id="orgdb2c631">How do I change my encryption settings?</h2>
-<div class="outline-text-2" id="text-orgdb2c631">
+<div id="outline-container-org2bd511f" class="outline-2">
+<h2 id="org2bd511f">How do I change my encryption settings?</h2>
+<div class="outline-text-2" id="text-org2bd511f">
 <p>
 Suppose that some new encryption vulnerability has been announced and that you need to change your encryption settings. Maybe an algorithm thought to be secure is now no longer so and you need to remove it. You can change your settings by doing the following:
 </p>
@@ -890,9 +927,9 @@ Select <i>Administrator controls</i> then select <i>Security Settings</i>. You w
 </p>
 </div>
 </div>
-<div id="outline-container-org748c030" class="outline-2">
-<h2 id="org748c030">How do I get a domain name?</h2>
-<div class="outline-text-2" id="text-org748c030">
+<div id="outline-container-orgcc9b703" class="outline-2">
+<h2 id="orgcc9b703">How do I get a domain name?</h2>
+<div class="outline-text-2" id="text-orgcc9b703">
 <p>
 Suppose that you have bought a domain name (rather than using a free subdomain on freedns) and you want to use that instead.
 </p>
@@ -956,9 +993,9 @@ You should now be able to send an email from <i>postmaster@mynewdomainname</i> a
 </div>
 </div>
 
-<div id="outline-container-org20d848a" class="outline-2">
-<h2 id="org20d848a">How do I get a "real" SSL/TLS/HTTPS certificate?</h2>
-<div class="outline-text-2" id="text-org20d848a">
+<div id="outline-container-org221b34b" class="outline-2">
+<h2 id="org221b34b">How do I get a "real" SSL/TLS/HTTPS certificate?</h2>
+<div class="outline-text-2" id="text-org221b34b">
 <p>
 If you did the full install or selected the social variant then the system will have tried to obtain a Let's Encrypt certificate automatically during the install process. If this failed for any reason, or if you have created a new site which you need a certificate for then do the following:
 </p>
@@ -977,9 +1014,9 @@ One thing to be aware of is that Let's Encrypt doesn't support many dynamic DNS
 </p>
 </div>
 </div>
-<div id="outline-container-org364e5b4" class="outline-2">
-<h2 id="org364e5b4">How do I renew a Let's Encrypt certificate?</h2>
-<div class="outline-text-2" id="text-org364e5b4">
+<div id="outline-container-org0180711" class="outline-2">
+<h2 id="org0180711">How do I renew a Let's Encrypt certificate?</h2>
+<div class="outline-text-2" id="text-org0180711">
 <p>
 Normally certificates will be automatically renewed once per month, so you don't need to be concerned about it. If anything goes wrong with the automatic renewal then you should receive a warning email.
 </p>
@@ -998,9 +1035,9 @@ Select <i>Administrator controls</i> then <b>Security settings</b> then <b>Renew
 </p>
 </div>
 </div>
-<div id="outline-container-org92cc380" class="outline-2">
-<h2 id="org92cc380">I tried to renew a Let's Encrypt certificate and it failed. What should I do?</h2>
-<div class="outline-text-2" id="text-org92cc380">
+<div id="outline-container-org019cece" class="outline-2">
+<h2 id="org019cece">I tried to renew a Let's Encrypt certificate and it failed. What should I do?</h2>
+<div class="outline-text-2" id="text-org019cece">
 <p>
 Most likely it's because Let's Encrypt doesn't support your particular domain or subdomain. Currently free subdomains tend not to work. You'll need to buy a domain name, link it to your dynamic DNS account and then do:
 </p>
@@ -1015,17 +1052,17 @@ Select <i>Administrator controls</i> then <b>Security settings</b> then <b>Creat
 </p>
 </div>
 </div>
-<div id="outline-container-org7fdf511" class="outline-2">
-<h2 id="org7fdf511">Why not use the services of $company instead? They took the Seppuku pledge</h2>
-<div class="outline-text-2" id="text-org7fdf511">
+<div id="outline-container-orge3b3f79" class="outline-2">
+<h2 id="orge3b3f79">Why not use the services of $company instead? They took the Seppuku pledge</h2>
+<div class="outline-text-2" id="text-orge3b3f79">
 <p>
 <a href="https://cryptostorm.org/viewtopic.php?f=63&amp;t=2954&amp;sid=7de2d1e699cfde2f574e6a7f6ea5a173">That pledge</a> is utterly worthless. Years ago people trusted Google in the same sort of way, because they promised not be be evil and because a lot of the engineers working for them seemed like honest types who were "<i>on our side</i>". Post-<a href="https://en.wikipedia.org/wiki/Nymwars">nymwars</a> and post-<a href="https://en.wikipedia.org/wiki/PRISM_(surveillance_program)">PRISM</a> we know exactly how much Google cared about the privacy and security of its users. But Google is only one particular example. In general don't trust pledges made by companies, even if the people running them seem really sincere.
 </p>
 </div>
 </div>
-<div id="outline-container-org2ac01d7" class="outline-2">
-<h2 id="org2ac01d7">Why does my email keep getting rejected as spam by Gmail/etc?</h2>
-<div class="outline-text-2" id="text-org2ac01d7">
+<div id="outline-container-orga476817" class="outline-2">
+<h2 id="orga476817">Why does my email keep getting rejected as spam by Gmail/etc?</h2>
+<div class="outline-text-2" id="text-orga476817">
 <p>
 Welcome to the world of email. Email is really the archetypal decentralized service, developed during the early days of the internet. In principle anyone can run an email server, and that's exactly what you're doing with Freedombone. Email is very useful, but it has a big problem, and that's that the protocols are totally insecure. That made it easy for spammers to do their thing, and in response highly elaborate spam filtering and blocking systems were developed. Chances are that your emails are being blocked in this way. Sometimes the blocking is so indisciminate that entire countries are excluded. What can you do about it? Unless you control the block list at the receiving end you may not be able to do much unless you can find an email proxy server which is trusted by the receiving server.
 </p>
@@ -1056,9 +1093,9 @@ So the situation with email presently is pretty bad, and there's a clear selecti
 </p>
 </div>
 </div>
-<div id="outline-container-orga441aa1" class="outline-2">
-<h2 id="orga441aa1">Tor is censored/blocked in my area. What can I do?</h2>
-<div class="outline-text-2" id="text-orga441aa1">
+<div id="outline-container-orgebcf081" class="outline-2">
+<h2 id="orgebcf081">Tor is censored/blocked in my area. What can I do?</h2>
+<div class="outline-text-2" id="text-orgebcf081">
 <p>
 If you can find some details for an obfs4 Tor bridge (its IP address, port number and key or nickname) then you can set up the system to use it to connect to the Tor network. Unlike relay nodes the IP addresses for bridges are not public information and so can't be easily known and added to block lists by authoritarian regimes or over-zealous ISPs.
 </p>
@@ -1083,9 +1120,9 @@ You can also set your system to act as a Tor bridge, although this is not recomm
 </div>
 </div>
 
-<div id="outline-container-orgaf2f408" class="outline-2">
-<h2 id="orgaf2f408">I want to block a particular domain from getting its content into my social network sites</h2>
-<div class="outline-text-2" id="text-orgaf2f408">
+<div id="outline-container-org97fe227" class="outline-2">
+<h2 id="org97fe227">I want to block a particular domain from getting its content into my social network sites</h2>
+<div class="outline-text-2" id="text-org97fe227">
 <p>
 If you're being pestered by some domain which contains bad/illegal/harrassing content or irritating users you can block domains at the firewall level. Go to the administrator control panel and select <i>domain blocking</i>. You can then block, unblock and view the list of blocked domains.
 </p>
@@ -1100,9 +1137,9 @@ Select <i>Administrator controls</i> then <i>Domain blocking</i>.
 </div>
 </div>
 
-<div id="outline-container-orgf5fd6ee" class="outline-2">
-<h2 id="orgf5fd6ee">The mesh system doesn't boot from USB drive</h2>
-<div class="outline-text-2" id="text-orgf5fd6ee">
+<div id="outline-container-org5b978bf" class="outline-2">
+<h2 id="org5b978bf">The mesh system doesn't boot from USB drive</h2>
+<div class="outline-text-2" id="text-org5b978bf">
 <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>
@@ -1113,9 +1150,9 @@ After the system has booted successfully the problem should resolve itself on su
 </div>
 </div>
 
-<div id="outline-container-org4b55e47" class="outline-2">
-<h2 id="org4b55e47">Mesh system doesn't connect to the network</h2>
-<div class="outline-text-2" id="text-org4b55e47">
+<div id="outline-container-orgf1d3c97" class="outline-2">
+<h2 id="orgf1d3c97">Mesh system doesn't connect to the network</h2>
+<div class="outline-text-2" id="text-orgf1d3c97">
 <p>
 Sometimes after boot the mesh system won't connect to other peers on the network. If this happens select the <b>network restart</b> icon and enter the password, which by default is just "freedombone". Wait for a few minutes to see if it connects.
 </p>

website/EN/homeserver.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>
-<!-- 2018-04-21 Sat 14:58 -->
+<!-- 2018-04-24 Tue 18:17 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>&lrm;</title>
@@ -243,9 +243,9 @@ for the JavaScript code in this tag.
 </div>
 
 
-<div id="outline-container-org920b3b6" class="outline-2">
-<h2 id="org920b3b6">Home Server</h2>
-<div class="outline-text-2" id="text-org920b3b6">
+<div id="outline-container-org3d2bd4a" class="outline-2">
+<h2 id="org3d2bd4a">Home Server</h2>
+<div class="outline-text-2" id="text-org3d2bd4a">
 <p>
 The quickest way to get started is as follows. You will need to be running a Debian based system (version 8 or later), have an old but still working laptop or netbook which you can use as a server, and 8GB or larger USB thumb drive and an ethernet cable to connect the laptop to your internet router.
 </p>
@@ -420,7 +420,7 @@ Then select <b>About</b>. You'll see a list of sites and their onion addresses.
 
 
 <div class="figure">
-<p><img src="images/controlpanel/control_panel_about.jpg" alt="control_panel_about.jpg" width="80%" align="center" />
+<p><img src="images/controlpanel/control_panel_about.jpg" alt="control_panel_about.jpg" width="100%" align="center" />
 </p>
 </div>
 

website/EN/mobile.html

@@ -3,26 +3,33 @@
 "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>
-<!-- 2018-04-12 Thu 18:25 -->
-<meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta  name="generator" content="Org-mode" />
-<meta  name="author" content="Bob Mottram" />
-<meta  name="description" content="Freedombone mobile setup"
+<!-- 2018-04-24 Tue 16:29 -->
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<title>&lrm;</title>
+<meta name="generator" content="Org mode" />
+<meta name="author" content="Bob Mottram" />
+<meta name="description" content="Freedombone mobile setup"
  />
-<meta  name="keywords" content="freedombone, mobile" />
+<meta name="keywords" content="freedombone, mobile" />
 <style type="text/css">
  <!--/*--><![CDATA[/*><!--*/
-  .title  { text-align: center; }
+  .title  { text-align: center;
+             margin-bottom: .2em; }
+  .subtitle { text-align: center;
+              font-size: medium;
+              font-weight: bold;
+              margin-top:0; }
   .todo   { font-family: monospace; color: red; }
-  .done   { color: green; }
+  .done   { font-family: monospace; color: green; }
+  .priority { font-family: monospace; color: orange; }
   .tag    { background-color: #eee; font-family: monospace;
             padding: 2px; font-size: 80%; font-weight: normal; }
   .timestamp { color: #bebebe; }
   .timestamp-kwd { color: #5f9ea0; }
-  .right  { margin-left: auto; margin-right: 0px;  text-align: right; }
-  .left   { margin-left: 0px;  margin-right: auto; text-align: left; }
-  .center { margin-left: auto; margin-right: auto; text-align: center; }
+  .org-right  { margin-left: auto; margin-right: 0px;  text-align: right; }
+  .org-left   { margin-left: 0px;  margin-right: auto; text-align: left; }
+  .org-center { margin-left: auto; margin-right: auto; text-align: center; }
   .underline { text-decoration: underline; }
   #postamble p, #preamble p { font-size: 90%; margin: .2em; }
   p.verse { margin-left: 3%; }
@@ -49,27 +56,111 @@
     border: 1px solid black;
   }
   pre.src:hover:before { display: inline;}
-  pre.src-sh:before    { content: 'sh'; }
-  pre.src-bash:before  { content: 'sh'; }
+  /* Languages per Org manual */
+  pre.src-asymptote:before { content: 'Asymptote'; }
+  pre.src-awk:before { content: 'Awk'; }
+  pre.src-C:before { content: 'C'; }
+  /* pre.src-C++ doesn't work in CSS */
+  pre.src-clojure:before { content: 'Clojure'; }
+  pre.src-css:before { content: 'CSS'; }
+  pre.src-D:before { content: 'D'; }
+  pre.src-ditaa:before { content: 'ditaa'; }
+  pre.src-dot:before { content: 'Graphviz'; }
+  pre.src-calc:before { content: 'Emacs Calc'; }
   pre.src-emacs-lisp:before { content: 'Emacs Lisp'; }
-  pre.src-R:before     { content: 'R'; }
-  pre.src-perl:before  { content: 'Perl'; }
-  pre.src-java:before  { content: 'Java'; }
-  pre.src-sql:before   { content: 'SQL'; }
+  pre.src-fortran:before { content: 'Fortran'; }
+  pre.src-gnuplot:before { content: 'gnuplot'; }
+  pre.src-haskell:before { content: 'Haskell'; }
+  pre.src-hledger:before { content: 'hledger'; }
+  pre.src-java:before { content: 'Java'; }
+  pre.src-js:before { content: 'Javascript'; }
+  pre.src-latex:before { content: 'LaTeX'; }
+  pre.src-ledger:before { content: 'Ledger'; }
+  pre.src-lisp:before { content: 'Lisp'; }
+  pre.src-lilypond:before { content: 'Lilypond'; }
+  pre.src-lua:before { content: 'Lua'; }
+  pre.src-matlab:before { content: 'MATLAB'; }
+  pre.src-mscgen:before { content: 'Mscgen'; }
+  pre.src-ocaml:before { content: 'Objective Caml'; }
+  pre.src-octave:before { content: 'Octave'; }
+  pre.src-org:before { content: 'Org mode'; }
+  pre.src-oz:before { content: 'OZ'; }
+  pre.src-plantuml:before { content: 'Plantuml'; }
+  pre.src-processing:before { content: 'Processing.js'; }
+  pre.src-python:before { content: 'Python'; }
+  pre.src-R:before { content: 'R'; }
+  pre.src-ruby:before { content: 'Ruby'; }
+  pre.src-sass:before { content: 'Sass'; }
+  pre.src-scheme:before { content: 'Scheme'; }
+  pre.src-screen:before { content: 'Gnu Screen'; }
+  pre.src-sed:before { content: 'Sed'; }
+  pre.src-sh:before { content: 'shell'; }
+  pre.src-sql:before { content: 'SQL'; }
+  pre.src-sqlite:before { content: 'SQLite'; }
+  /* additional languages in org.el's org-babel-load-languages alist */
+  pre.src-forth:before { content: 'Forth'; }
+  pre.src-io:before { content: 'IO'; }
+  pre.src-J:before { content: 'J'; }
+  pre.src-makefile:before { content: 'Makefile'; }
+  pre.src-maxima:before { content: 'Maxima'; }
+  pre.src-perl:before { content: 'Perl'; }
+  pre.src-picolisp:before { content: 'Pico Lisp'; }
+  pre.src-scala:before { content: 'Scala'; }
+  pre.src-shell:before { content: 'Shell Script'; }
+  pre.src-ebnf2ps:before { content: 'ebfn2ps'; }
+  /* additional language identifiers per "defun org-babel-execute"
+       in ob-*.el */
+  pre.src-cpp:before  { content: 'C++'; }
+  pre.src-abc:before  { content: 'ABC'; }
+  pre.src-coq:before  { content: 'Coq'; }
+  pre.src-groovy:before  { content: 'Groovy'; }
+  /* additional language identifiers from org-babel-shell-names in
+     ob-shell.el: ob-shell is the only babel language using a lambda to put
+     the execution function name together. */
+  pre.src-bash:before  { content: 'bash'; }
+  pre.src-csh:before  { content: 'csh'; }
+  pre.src-ash:before  { content: 'ash'; }
+  pre.src-dash:before  { content: 'dash'; }
+  pre.src-ksh:before  { content: 'ksh'; }
+  pre.src-mksh:before  { content: 'mksh'; }
+  pre.src-posh:before  { content: 'posh'; }
+  /* Additional Emacs modes also supported by the LaTeX listings package */
+  pre.src-ada:before { content: 'Ada'; }
+  pre.src-asm:before { content: 'Assembler'; }
+  pre.src-caml:before { content: 'Caml'; }
+  pre.src-delphi:before { content: 'Delphi'; }
+  pre.src-html:before { content: 'HTML'; }
+  pre.src-idl:before { content: 'IDL'; }
+  pre.src-mercury:before { content: 'Mercury'; }
+  pre.src-metapost:before { content: 'MetaPost'; }
+  pre.src-modula-2:before { content: 'Modula-2'; }
+  pre.src-pascal:before { content: 'Pascal'; }
+  pre.src-ps:before { content: 'PostScript'; }
+  pre.src-prolog:before { content: 'Prolog'; }
+  pre.src-simula:before { content: 'Simula'; }
+  pre.src-tcl:before { content: 'tcl'; }
+  pre.src-tex:before { content: 'TeX'; }
+  pre.src-plain-tex:before { content: 'Plain TeX'; }
+  pre.src-verilog:before { content: 'Verilog'; }
+  pre.src-vhdl:before { content: 'VHDL'; }
+  pre.src-xml:before { content: 'XML'; }
+  pre.src-nxml:before { content: 'XML'; }
+  /* add a generic configuration mode; LaTeX export needs an additional
+     (add-to-list 'org-latex-listings-langs '(conf " ")) in .emacs */
+  pre.src-conf:before { content: 'Configuration File'; }
 
   table { border-collapse:collapse; }
   caption.t-above { caption-side: top; }
   caption.t-bottom { caption-side: bottom; }
   td, th { vertical-align:top;  }
-  th.right  { text-align: center;  }
-  th.left   { text-align: center;   }
-  th.center { text-align: center; }
-  td.right  { text-align: right;  }
-  td.left   { text-align: left;   }
-  td.center { text-align: center; }
+  th.org-right  { text-align: center;  }
+  th.org-left   { text-align: center;   }
+  th.org-center { text-align: center; }
+  td.org-right  { text-align: right;  }
+  td.org-left   { text-align: left;   }
+  td.org-center { text-align: center; }
   dt { font-weight: bold; }
-  .footpara:nth-child(2) { display: inline; }
-  .footpara { display: block; }
+  .footpara { display: inline; }
   .footdef  { margin-bottom: 1em; }
   .figure { padding: 1em; }
   .figure p { text-align: center; }
@@ -89,6 +180,7 @@
     { font-size: 10px; font-weight: bold; white-space: nowrap; }
   .org-info-js_search-highlight
     { background-color: #ffff00; color: #000000; font-weight: bold; }
+  .org-svg { width: 90%; }
   /*]]>*/-->
 </style>
 <link rel="stylesheet" type="text/css" href="freedombone.css" />
@@ -97,7 +189,7 @@
 @licstart  The following is the entire license notice for the
 JavaScript code in this tag.
 
-Copyright (C) 2012-2013 Free Software Foundation, Inc.
+Copyright (C) 2012-2017 Free Software Foundation, Inc.
 
 The JavaScript code in this tag is free software: you can
 redistribute it and/or modify it under the terms of the GNU
@@ -144,55 +236,19 @@ for the JavaScript code in this tag.
 <a name="top" id="top"></a>
 </div>
 <div id="content">
-<h1 class="title"></h1>
 
 <div class="figure">
 <p><img src="images/logo.png" alt="logo.png" width="80%" height="10%" align="center" />
 </p>
 </div>
 
-<div id="outline-container-sec-1" class="outline-2">
-<h2 id="sec-1">Mobile</h2>
-<div class="outline-text-2" id="text-1">
 <p>
 Mobile phones are insecure devices, but they're regarded as being so essential to modern life that telling people not to use them isn't a viable option. Here are some recommendations on setting up a mobile phone (aka "smartphone") to work with Freedombone.
 </p>
 
-<div class="export">
-<p>
- &lt;center&gt;
- &lt;table style="width:80%; border:0"&gt;
-  &lt;tr&gt;
-    &lt;td&gt;&lt;center&gt;&lt;b&gt;&lt;h3&gt;Open&lt;/h3&gt;&lt;/b&gt;&lt;br&gt;Use a free and open source operating system. Open means more trustworthy&lt;/center&gt;&lt;/td&gt;
-    &lt;td&gt;&lt;center&gt;&lt;b&gt;&lt;h3&gt;Remove&lt;/h3&gt;&lt;/b&gt;&lt;br&gt;If there are any proprietary apps then remove or deactivate them&lt;/center&gt;&lt;/td&gt;
-  &lt;/tr&gt;
-  &lt;tr&gt;
-    &lt;td&gt;&lt;center&gt;&lt;b&gt;&lt;h3&gt;Encrypt&lt;/h3&gt;&lt;/b&gt;&lt;br&gt;Make sure your phone is encrypted with a password which isn't easy to guess&lt;/center&gt;&lt;/td&gt;
-    &lt;td&gt;&lt;center&gt;&lt;b&gt;&lt;h3&gt;Apps&lt;/h3&gt;&lt;/b&gt;&lt;br&gt;Use F-droid to install new apps&lt;/center&gt;&lt;/td&gt;
-  &lt;/tr&gt;
-  &lt;tr&gt;
-    &lt;td&gt;&lt;center&gt;&lt;b&gt;&lt;h3&gt;Lock&lt;/h3&gt;&lt;/b&gt;&lt;br&gt;Enable a lock screen with a maximum number of password guesses&lt;/center&gt;&lt;/td&gt;
-    &lt;td&gt;&lt;center&gt;&lt;b&gt;&lt;h3&gt;Onion&lt;/h3&gt;&lt;/b&gt;&lt;br&gt;Onion route your connections to avoid bulk metadata collection&lt;/center&gt;&lt;/td&gt;
-  &lt;/tr&gt;
-  &lt;tr&gt;
-    &lt;td&gt;&lt;center&gt;&lt;b&gt;&lt;h3&gt;Email&lt;/h3&gt;&lt;/b&gt;&lt;br&gt;Access webmail in a browser&lt;/center&gt;&lt;/td&gt;
-    &lt;td&gt;&lt;center&gt;&lt;b&gt;&lt;h3&gt;Services&lt;/h3&gt;&lt;/b&gt;&lt;br&gt;Connect to the Freedombone services&lt;/center&gt;&lt;/td&gt;
-  &lt;/tr&gt;
-  &lt;tr&gt;
-    &lt;td&gt;&lt;center&gt;&lt;b&gt;&lt;h3&gt;Battery&lt;/h3&gt;&lt;/b&gt;&lt;br&gt;Avoid battery-eating apps and disable some optimisations&lt;/center&gt;&lt;/td&gt;
-    &lt;td&gt;&lt;center&gt;&lt;b&gt;&lt;h3&gt;Block&lt;/h3&gt;&lt;/b&gt;&lt;br&gt;Prevent access to know bad domains&lt;/center&gt;&lt;/td&gt;
-  &lt;/tr&gt;
-&lt;/table&gt;
-&lt;/center&gt;
-</p>
-
-</div>
-</div>
-</div>
-
-<div id="outline-container-sec-2" class="outline-2">
-<h2 id="sec-2">Open</h2>
-<div class="outline-text-2" id="text-2">
+<div id="outline-container-orgc9f2368" class="outline-2">
+<h2 id="orgc9f2368">Open</h2>
+<div class="outline-text-2" id="text-orgc9f2368">
 <p>
 Use a Linux based phone operating system. Typically this will mean Android, but could also mean LineageOS or Replicant. LineageOS is the most preferable, because you can usually get an up to date image with a recent kernel which will give you better security against exploits. If you're buying a phone then look for a model which is supported by LineageOS. Replicant is the most free (as in freedom) but only runs on a small number of phone models. If you have a phone which runs a full GNU/Linux system then that's fantastic, and you can probably use it in much the same way as a desktop system and the rest of the advice on this page won't apply. If you don't have a phone capable of running a Linux based operating system then consider selling, giving away or bartering your existing one.
 </p>
@@ -207,27 +263,27 @@ In the end it comes down to the fact that <i>if the source code for the device c
 </div>
 </div>
 
-<div id="outline-container-sec-3" class="outline-2">
-<h2 id="sec-3">Remove</h2>
-<div class="outline-text-2" id="text-3">
+<div id="outline-container-org1da5240" class="outline-2">
+<h2 id="org1da5240">Remove</h2>
+<div class="outline-text-2" id="text-org1da5240">
 <p>
 So maybe you're running Android and the phone came with some apps already installed. Almost certainly they'll be proprietary. Go to Settings/Apps and then uninstall or deactivate any apps which you really don't need. Mostly preinstalled apps are intended to send your data to companies who will then sell it to advertisers or governments under the business model of <i>surveillance capital</i>. It's not a good idea to get caught up in that, and to avoid becoming addicted to apps which are surveilling you without consent or installing spyware in the background without your knowledge.
 </p>
 </div>
 </div>
 
-<div id="outline-container-sec-4" class="outline-2">
-<h2 id="sec-4">Encrypt</h2>
-<div class="outline-text-2" id="text-4">
+<div id="outline-container-orge6cd0f0" class="outline-2">
+<h2 id="orge6cd0f0">Encrypt</h2>
+<div class="outline-text-2" id="text-orge6cd0f0">
 <p>
 Encrypt your phone. This can usually be done via <b>Settings/Security</b> and you may need to fully charge the phone first. Encryption means that if you lose your phone or it gets stolen then there is less chance that anyone who picks it up will get access to your data, photos and so on.
 </p>
 </div>
 </div>
 
-<div id="outline-container-sec-5" class="outline-2">
-<h2 id="sec-5">Apps</h2>
-<div class="outline-text-2" id="text-5">
+<div id="outline-container-org149be87" class="outline-2">
+<h2 id="org149be87">Apps</h2>
+<div class="outline-text-2" id="text-org149be87">
 <p>
 Installing <b>F-droid</b> and only adding any new apps via F-droid will ensure that you are always using free and open source software. Open source is not a panacea, since bugs can and do still occur, but it will help you to avoid the worst security and privacy pitfalls.
 </p>
@@ -238,18 +294,18 @@ Avoid using the Open Whisper Systems Signal app if you can, no matter what "expe
 </div>
 </div>
 
-<div id="outline-container-sec-6" class="outline-2">
-<h2 id="sec-6">Lock</h2>
-<div class="outline-text-2" id="text-6">
+<div id="outline-container-orgd1ea4fa" class="outline-2">
+<h2 id="orgd1ea4fa">Lock</h2>
+<div class="outline-text-2" id="text-orgd1ea4fa">
 <p>
 Add a lock screen, preferably with a password which is not easy for other people to guess or for quicker access with a PIN number. Install an app called <b>Locker</b>, activate it and set the maximum number of password guesses to ten (or whatever you feel comfortable with). If bad people get hold of your phone then they may try to brute force your lock screen password or PIN (i.e. automatically trying millions of common word and number combinations) and the locker app will prevent them from succeeding by resetting the phone back to its factory default condition and wiping the data.
 </p>
 </div>
 </div>
 
-<div id="outline-container-sec-7" class="outline-2">
-<h2 id="sec-7">Onion</h2>
-<div class="outline-text-2" id="text-7">
+<div id="outline-container-org98e33e6" class="outline-2">
+<h2 id="org98e33e6">Onion</h2>
+<div class="outline-text-2" id="text-org98e33e6">
 <p>
 Both governments and corporations want to compile matadata dossiers about you. Who you communicated with, when and how often. They want this so that they can data mine, simulate, predict and then ultimately influence (sometimes also called "nudge") your actions and preferences in the directions they prefer. By routing your connections through a number of proxy servers (Tor routers) you can make it perhaps not <i>theoretically</i> impossible but at least <i>very hard</i> for them to have a complete and accurate list of who your friends are, your religion, politics, likely health issues, sexual orientation and what news sites or books you read.
 </p>
@@ -260,26 +316,26 @@ In F-droid under the <b>repositories</b> menu you can enable the <b>guardian pro
 </div>
 </div>
 
-<div id="outline-container-sec-8" class="outline-2">
-<h2 id="sec-8">Email</h2>
-<div class="outline-text-2" id="text-8">
+<div id="outline-container-org0b855a4" class="outline-2">
+<h2 id="org0b855a4">Email</h2>
+<div class="outline-text-2" id="text-org0b855a4">
 <p>
 The easiest way to access email is by installing the <a href="./app_mailpile.html">Mailpile</a> app. This keeps your GPG keys off of possibly insecure mobile devices but still enables encrypted email communications in an easy way. You can use K9 mail if you prefer, but that will require installing OpenKeychain and having your GPG keys on the device, which is a lot more risky.
 </p>
 </div>
 </div>
-<div id="outline-container-sec-9" class="outline-2">
-<h2 id="sec-9">Services</h2>
-<div class="outline-text-2" id="text-9">
+<div id="outline-container-org4eecc0f" class="outline-2">
+<h2 id="org4eecc0f">Services</h2>
+<div class="outline-text-2" id="text-org4eecc0f">
 <p>
 For information on configuring various apps to work with Freedombone see the <a href="./apps.html">apps section</a>. Also see advice on chat apps in the <a href="./faq.html">FAQ</a>.
 </p>
 </div>
 </div>
 
-<div id="outline-container-sec-10" class="outline-2">
-<h2 id="sec-10">Battery</h2>
-<div class="outline-text-2" id="text-10">
+<div id="outline-container-org0f96cf1" class="outline-2">
+<h2 id="org0f96cf1">Battery</h2>
+<div class="outline-text-2" id="text-org0f96cf1">
 <p>
 Even with free software apps it's not difficult to get into a situation where your battery doesn't last for long. To maximize battery life access RSS feeds via the onion-based mobile reader within a Tor-compatible browser and not from a locally installed RSS app.
 </p>
@@ -298,9 +354,9 @@ It's also recommended to disable battery optimisations for Conversations and Orb
 </div>
 </div>
 
-<div id="outline-container-sec-11" class="outline-2">
-<h2 id="sec-11">Blocking bad domains</h2>
-<div class="outline-text-2" id="text-11">
+<div id="outline-container-orgb6d0da7" class="outline-2">
+<h2 id="orgb6d0da7">Blocking bad domains</h2>
+<div class="outline-text-2" id="text-orgb6d0da7">
 <p>
 You can block known bad domains by editing the <b>/system/etc/hosts</b> file on your device. It is possible to use extensive ad-blocking hosts files used by other ad-blocking systems such as pi-hole, but merely blocking Facebook and Google Analytics will protect you against much of the corporate surveillance which goes on. Even if you don't have a Facebook account this may still be useful since they will still try to create a "ghost profile" of you, so the less data they have the better.
 </p>
@@ -318,7 +374,6 @@ On your system (not the device) install the <b>android-tools</b> package. For ex
 </p>
 
 <div class="org-src-container">
-
 <pre class="src src-bash">sudo pacman -S android-tools
 </pre>
 </div>
@@ -328,7 +383,6 @@ Connect the device to your system via a USB cable, then:
 </p>
 
 <div class="org-src-container">
-
 <pre class="src src-bash">adb root
 adb remount
 adb pull /system/etc/hosts
@@ -340,7 +394,6 @@ Now edit the hosts file which was pulled and append:
 </p>
 
 <div class="org-src-container">
-
 <pre class="src src-bash">127.0.0.1       www.facebook.com
 127.0.0.1       facebook.com
 127.0.0.1       static.ak.fbcdn.net
@@ -365,7 +418,6 @@ Then upload the hosts file back again with:
 </p>
 
 <div class="org-src-container">
-
 <pre class="src src-bash">adb push hosts /system/etc/hosts
 </pre>
 </div>
@@ -374,14 +426,9 @@ Then upload the hosts file back again with:
 Once that's done you may want to set <b>Root access</b> on the device back to <b>Disabled</b> and turn <b>Android debugging</b> off.
 </p>
 
-<div class="export">
-<p>
-&lt;center&gt;
-Return to the &lt;a href="index.html"&gt;home page&lt;/a&gt;
-&lt;/center&gt;
-</p>
-
-</div>
+<center>
+Return to the <a href="index.html">home page</a>
+</center>