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

doc/EN/app_pleroma.org

@@ -49,6 +49,12 @@ If you prefer a Tweetdeck-style user interface, similar to Mastodon, then once y
 [[file:images/pleromamastodon.jpg]]
 #+END_CENTER
 
+* Mobile apps
+It's also possible to use Mastodon apps together with Pleroma, such as Tusky, since it supports the Mastodon API. You may need to install *IcecatMobile* and set it as your default browser (under *Settings/Apps/Menu*) in order for the initial oauth registration process to work.
+
+#+BEGIN_CENTER
+[[file:images/tusky.jpg]]
+#+END_CENTER
 * Blocking controls
 #+BEGIN_CENTER
 [[file:images/controlpanel/control_panel_blocking.jpg]]

doc/EN/apps.org

@@ -10,10 +10,6 @@
 [[file:images/logo.png]]
 #+END_CENTER
 
-#+begin_export html
-<center><h1>Apps</h1></center>
-#+end_export
-
 #+begin_quote
 "/In times of aggressive corporatization, increasing enclosure of communication spaces, and blanket surveillance, emancipatory communication practices appear to be particularly well suited to offer concrete alternatives to activists and citizens alike/" -- Stefania Milan
 #+end_quote
@@ -53,6 +49,8 @@ Extremely simple and distraction-free notes system.
 If you use the Mutt client to read your email then this will set it up to use emacs for composing new mail.
 
 [[./app_emacs.html][How to use it]]
+* Email Server
+Since many apps require email registration an email server is installed by default. You can find advice on using the email system [[./usage_email.html][here]].
 * Etherpad
 Collaborate on creating documents in real time. Maybe you're planning a holiday with other family members or creating documentation for a Free Software project along with other volunteers. Etherpad is hard to beat for simplicity and speed. Only users of the system will be able to access it.
 

doc/EN/fediverse.org

@@ -10,16 +10,14 @@
 [[file:images/logo.png]]
 #+END_CENTER
 
-#+BEGIN_EXPORT html
-<center>
-<h1>Homesteading the Fediverse</h1>
-</center>
-#+END_EXPORT
+#+BEGIN_CENTER
+*Homesteading the Fediverse*
+#+END_CENTER
 
 Some things you might want to know about the Fediverse:
 
 * Federation as a concept
-The political definition of a federation is "/a union of partially self-governing states or regions under a central (federal) government/". The fediverse isn't exactly like that, in that there is no federal government. However there are protocols which govern the communication between instances and that might be analogized to being a sort of elemantary constitution or mutual agreement binding all participants together. The protocols are merely ways of moving data around though, and don't impose any sort of moral code.
+The political definition of a federation is "/a union of partially self-governing states or regions under a central (federal) government/". The fediverse isn't exactly like that, in that there is no federal government. However there are protocols which govern the communication between instances and that might be analogized to being a sort of elementary constitution or mutual agreement binding all participants together. The protocols are merely ways of moving data around though, and don't impose any sort of moral code.
 * Keep the number of users on each server small
 The importance of this can't be overstated. Servers with lots of users always eventually have problems where the interests of the users are not the same as the interests of the server administrator. If you are the server administrator, or if there are only a small squad-size group of people on the server, then it's a lot easier to resolve differences and everyone's interests are likely to be similar.
 
@@ -33,7 +31,9 @@ Especially if other servers are publishing content which may not be legal in you
 Over time follows and blocking rules come to match the underlying social geography of affinity groups. Blocking will happen and users will move around or start new servers. Drama related to blocking will dissipate.
 
 * Keep your follows under the Dunbar number
-Keep the number of other users you're following and who are also active to under a couple of hundred. Any more than that and you'll just be overwhelmed by irrelevant stuff and whatever community you may have been part of will dissolve in a sea of entropy. There are no algorithmic timelines, and even if they're introduced then they create their own problems as an opaque form of censorship. _Real community happens at tribal scale_. It's something which people often don't like to admit because they get fixated upon bigger and bigger numbers, but it definitely seems to be true.
+Keep the number of other frequently active users you're following to under a couple of hundred. Your actual number of follows might be larger than this but could include users who rarely post anything.
+
+Once there are more than a couple of hundred highly active users in your timeline then you'll just be overwhelmed by irrelevant stuff and whatever community you may have been part of will be drowned in the entropy. There are no algorithmic timelines to hide posts, and even if they're introduced then they create their own problems as an opaque form of censorship. _Real community happens at tribal scale_. It's something which people often don't like to admit because they get fixated upon bigger and bigger numbers, but it definitely seems to be true.
 
 * Avoid big public servers
 It may seem like a good idea and it may seem like you're doing a service to the community by allowing random strangers to register, but servers with thousands of users only cause problems - social, administrative, financial and possibly also legal. The financial strain of running a powerful server with high reliability may be enough to encourage the administrator to begin pushing advertising onto the system, or sell user content, and then before you know it you have identical problems to Twitter. Instead try to encourage people to set up their own servers. Follow this principle and a lot of arguments and stress will be more easily avoided.

doc/EN/index.org

@@ -19,25 +19,26 @@
 
 So you want to run your own internet services? Email, chat, VoIP, web sites, file synchronisation, wikis, blogs, social networks, media hosting, backups, VPN. Freedombone enables you to do all of that in a self-hosted way, where you keep control of your data and it resides in your own home.
 
-[[./homeserver.html][Here's how]].
+A list of other supported ARM boards [[./boards.html][can be found here]], or you can install onto an old laptop or netbook. Some installation instructions for different use cases are:
 
-And here's how [[./beaglebone.html][on a Beaglebone Black]]. A list of other supported ARM boards [[./boards.html][can be found here]].
-
-Or you can install [[./debianinstall.html][onto an existing Debian system]].
-
-If you have a single board ARM computer which isn't one of the officially supported ones, such as Raspberry Pi, then you may still be able to install [[./armbian.html][Freedombone with Armbian]].
-
-Want to make a community mesh network which can either be fully autonomous or connected to the internet? The [[./mesh.html][Freedombone Mesh]] is a wireless solution for networked communication that can be rapidly deployed in temporary, emergency or post-disaster situations where internet access is unavailable or compromised, or used as an infrastructural community service similar to [[https://en.wikipedia.org/wiki/Freifunk][Freifunk]].
+ * [[./homeserver.html][Typical installation]]
+ * Installing [[./beaglebone.html][on a Beaglebone Black]]
+ * Installing on an [[./debianinstall.html][existing Debian system]]
+ * Installing [[./armbian.html][on Armbian]], for unsupported ARM boards such as Raspberry Pi
+ * Creating a dedicated [[./socialinstance.html][fediverse instance]] for a single user or to host a community
+ * Deploying a [[./mesh.html][mesh network]] which can operate with or without the internet
 
 After installation it's possible that you might want some advice on how to run your system and set up apps to work nicely with it.
 
  * [[./domains.html][How to get a domain name]]
+ * [[./security.html][Improving security]]
+ * [[./users.html][Adding or removing users]]
  * [[./apps.html][Apps available on the system]]
- * [[./usage.html][General usage]]
  * [[./faq.html][Frequently Asked Questions]]
  * [[./mobile.html][Advice on setting up a mobile phone]]
  * [[./support.html][I like this project. How can I help to support it?]]
 
+
 If you find bugs, or want to add a new app to this system see the [[./devguide.html][Developers Guide]] and [[./codeofconduct.html][Code of Conduct]]. There is a Matrix chat room available at *#fbone:matrix.freedombone.net*.
 
 Ready made disk images which can be copied onto USB or microSD drives are [[./downloads/current][available here]].

doc/EN/security.org

@@ -0,0 +1,48 @@
+#+TITLE:
+#+AUTHOR: Bob Mottram
+#+EMAIL: bob@freedombone.net
+#+KEYWORDS: freedombone, security, ssh, debian, beaglebone
+#+DESCRIPTION: Improving security
+#+OPTIONS: ^:nil toc:nil
+#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="freedombone.css" />
+
+#+BEGIN_CENTER
+[[file:images/logo.png]]
+#+END_CENTER
+
+* Authentication with keys
+It's a lot more secure to log in to the Freedombone system using ssh keys rather than with a password. You can set that up by first running:
+
+#+begin_src bash
+freedombone-client
+#+end_src
+
+On your local system (i.e. whatever you're logging in to the Freedombone system from, typically a laptop). Then:
+
+#+begin_src
+ssh myusername@freedombone.local -p 2222
+#+end_src
+
+Select *Administrator controls* and re-enter your password, then *Manage Users* and *Change user ssh public key*. Copy and paste the ssh public keys which appeared after the *freedombone-client* command was run. Then go to *Security settings* and select *Allow ssh login with passwords* followed by *no*.
+
+You'll need to make sure that you have a copy of the ~/.ssh directory on your local system. You could just copy that directory to a USB drive and then keep that somewhere safe so that you can restore the keys if you need to.
+* Administrating the system via an onion address (Tor)
+You can also access your system via the Tor system using an onion address. To find out what the onion address for ssh access is you can do the following:
+
+#+BEGIN_SRC bash
+ssh username@freedombone.local -p 2222
+#+END_SRC
+
+Select /Administrator controls/ then select "About this system" and look for the onion address for ssh. You can then close the terminal and open another, then do the following on your local system:
+
+#+BEGIN_SRC bash
+freedombone-client
+#+END_SRC
+
+This will set up your ssh environment to be able to handle onion addresses. Then you can test ssh with:
+
+#+BEGIN_SRC bash
+ssh username@address.onion -p 2222
+#+END_SRC
+
+Subsequently even if dynamic DNS isn't working you may still be able to administer your system. Using the onion address also gives you some degree of protection against corporate or government metadata analysis, since it becomes more difficult to passively detect which systems are communicating.

doc/EN/socialinstance.org

@@ -0,0 +1,93 @@
+#+TITLE:
+#+AUTHOR: Bob Mottram
+#+EMAIL: bob@freedombone.net
+#+KEYWORDS: freedombone, debian, social, fediverse, instance, pleroma, gnusocial, postactiv
+#+DESCRIPTION: Social Instance
+#+OPTIONS: ^:nil toc:nil
+#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="freedombone.css" />
+
+#+BEGIN_CENTER
+[[file:images/logo.png]]
+#+END_CENTER
+
+#+BEGIN_EXPORT html
+<center>
+<h1>Social Instance</h1>
+</center>
+#+END_EXPORT
+
+A social instance image allows you to easily set up a fediverse server, which federates using the OStatus or ActivityPub protocol. You will need:
+
+ * An old laptop, capable of booting from USB
+ * A USB drive, preferably Sandisk and 16GB or larger
+ * An ethernet patch cable
+ * A domain name of your own
+ * A dynamic DNS account
+
+The installation process is the same as usual, with the only difference being that on initial setup it will go straight to the domain setup details for your instance. In summary:
+
+* Copy the image to the USB drive
+
+Substitute *sdX* with the device name for your USB drive.
+
+#+begin_src bash
+sudo apt-get install xz-utils wget
+wget https://freedombone.net/downloads/current/freedombone-pleroma-amd64.img.xz
+wget https://freedombone.net/downloads/current/freedombone-pleroma-amd64.img.xz.sig
+gpg --verify freedombone-pleroma-amd64.img.xz.sig
+unxz freedombone-pleroma-amd64.img.xz
+sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8
+sudo dd bs=1M if=freedombone-pleroma-amd64.img of=/dev/sdX conv=fdatasync
+#+end_src
+
+Also note that if the laptop has a removable SSD drive it's possible to copy the image directly to that if you have enough equipment.
+
+* Connect the laptop to your internet router
+
+Plug the USB drive into the laptop and connect it to your internet router with the ethernet cable.
+
+#+BEGIN_CENTER
+[[file:images/laptop_router.jpg]]
+#+END_CENTER
+
+* Boot the laptop from the USB drive
+
+You may need to alter the BIOS settings to get this to work reliably.
+
+#+BEGIN_CENTER
+[[file:images/bios_boot_usb.jpg]]
+#+END_CENTER
+
+* Forward ports 80 (HTTP) and 443 (HTTPS) from your internet router to the laptop
+
+Log into your internet router using a non-Tor browser (usually it's on an address like 192.168.1.1 or 192.168.1.254). Often port forwarding settings are together with firewall settings.
+
+#+BEGIN_CENTER
+[[file:images/port_forwarding.png]]
+#+END_CENTER
+
+* From another machine ssh into the laptop
+
+#+begin_src bash
+ssh fbone@freedombone.local -p 2222
+#+END_SRC
+
+Or alternatively you can log in directly on the laptop. The initial username is *fbone* and the password is *freedombone*. You should make sure you write down or copy the new password when it is shown.
+
+* Follow the setup procedure
+
+Enter your user details, domain name and dynamic DNS settings.
+
+* When installation is complete
+
+Navigate to your domain and register a new user.
+
+#+BEGIN_CENTER
+[[file:images/pleroma_register.jpg]]
+#+END_CENTER
+
+More details about setting up and using Pleroma [[./app_pleroma.html][can be found here]].
+
+#+BEGIN_CENTER
+[[file:images/tusky.jpg]]
+#+END_CENTER

doc/EN/usage_email.org

@@ -10,23 +10,17 @@
 [[file:images/logo.png]]
 #+END_CENTER
 
-#+BEGIN_EXPORT html
-<center>
-<h1>Email</h1>
-</center>
-#+END_EXPORT
-
 | [[Things to be aware of]]                           |
 | [[A technical note about email transport security]] |
 | [[Add a password to your GPG key]]                  |
 | [[Publishing your GPG public key]]                  |
 | [[Mutt email client]]                               |
 | [[Thunderbird/Icedove]]                             |
-| [[K9 Android client]]                               |
+| [[Android apps]]                                    |
 | [[Subscribing to mailing lists]]                    |
 | [[Adding email addresses to a group/folder]]        |
 | [[Ignoring incoming emails]]                        |
-| [[Your own mailing list]]                           |
+| [[Using I2P for email transport]]                   |
 
 * Things to be aware of
 Even though this system makes it easy to set up an email server, running your own email system is still not easy and this is mainly due to the huge amount of collatoral damage caused by spammers over a long period of time, which in turn is due to the inherent insecurity of email protocols which enabled spam to become a big problem. Email is still very popular though and most internet services require that you have an email address in order to register.
@@ -40,7 +34,7 @@ Port 465 is used for SMTP and this is supposedly deprecated for secure email. Ho
 From https://motherboard.vice.com/read/email-encryption-is-broken:
 
 #+BEGIN_QUOTE
-The researchers also uncovered mass scale attacks of STARTTLS sessions being stripped of their encryption. That attack itself isn't new: internet service providers sometimes do it to monitor users; organizations may use it to keep an eye on employees; or it may come from a malicious actor
+/The researchers also uncovered mass scale attacks of STARTTLS sessions being stripped of their encryption. That attack itself isn't new: internet service providers sometimes do it to monitor users; organizations may use it to keep an eye on employees; or it may come from a malicious actor/
 #+END_QUOTE
 * Add a password to your GPG key
 If you didn't use existing GPG keys during the Freedombone installation then you'll need to add a password to your newly generated private key. This is highly recommended. Go through the following sequence of commands to ssh into the Freedombone and then change your GPG password.
@@ -202,232 +196,8 @@ By default you won't be able to see any folders which you may have created earli
 
 Make sure that "*show only subscribed folders*" is not checked.  Then click the *ok* buttons.  Folders will be re-scanned, which may take some time depending upon how much email you have, but your folders will then appear.
 
-* K9 Android client
-*** A point about GPG on Android
-Before trying to set up email on Android you may want to consider whether you really need to do this. Android (and its variants) is not a particularly secure operating system and whether or not you wish to store GPG keys on it depends on your threat model and in what situations you'll be using your device.
-
-If you are going to use email on an Android device then ensure that you have full encryption enabled via the security settings, so that if you subsequently lose it, or if it gets stolen, the chances of encryption keys being exposed are minimised.
-*** Compiling the development version
-To get K9 working with Freedombone you'll need to install development versions of OpenKeychain and K9. At the time of writing the versions available in F-Droid do not support PGP/MIME or the "hidden recipient" feature of GPG. It is hoped that at some stage the patches will be integrated into the mainline or functionally equivalent changes made. Admittedly, this is not at all user friendly, but currently it's the only way to read Freedombone email on Android systems.
-
-Build script for OpenKeychain:
-
-#+BEGIN_SRC bash
-mkdir ~/develop
-cd ~/develop
-git clone https://github.com/bashrc/open-keychain
-cd open-keychain
-git checkout origin/bashrc/hidden-recipient-minimal
-git checkout -b bashrc/hidden-recipient-minimal
-cd tools
-nano build.sh
-#+END_SRC
-
-Then add the following:
-
-#+BEGIN_SRC bash
-#!/bin/bash
-
-# This script is intended to be used on Debian systems for building
-# the project. It has been tested with Debian 8
-
-USERNAME=$USER
-SIGNING_NAME='openkeychain'
-SDK_VERSION='r23.3.4'
-SDK_DIR=$HOME/android-sdk
-
-cd ..
-
-PROJECT_HOME=$(pwd)
-
-sudo apt-get install build-essential default-jdk \
-     lib32stdc++6 lib32z1 lib32z1-dev
-
-if [ ! -d $SDK_DIR ]; then
-    mkdir -p $SDK_DIR
-fi
-cd $SDK_DIR
-
-# download the SDK
-if [[ ! -f $SDK_DIR/android-sdk_$SDK_VERSION-linux.tgz ]]; then
-    wget https://dl.google.com/android/android-sdk_$SDK_VERSION-linux.tgz
-fi
-tar -xzvf android-sdk_$SDK_VERSION-linux.tgz
-SDK_DIR=$SDK_DIR/android-sdk-linux
-
-echo 'Check that you have the SDK tools installed for Android 22, SDK 21.1.2'
-
-export ANDROID_HOME=$SDK_DIR
-echo "sdk.dir=$SDK_DIR" > $ANDROID_HOME/local.properties
-export PATH=${PATH}:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools
-
-cd $SDK_DIR/tools
-./android sdk
-
-if [ ! -f $SDK_DIR/tools/android ]; then
-    echo "$SDK_DIR/tools/android not found"
-    exit -1
-fi
-cd $SDK_DIR
-chmod -R 0755 $SDK_DIR
-chmod a+rx $SDK_DIR/tools
-
-# android sdk
-cd $PROJECT_HOME
-git submodule init && git submodule update
-
-if [ ! -f $SDK_DIR/tools/templates/gradle/wrapper/gradlew ]; then
-    echo "$SDK_DIR/tools/templates/gradle/wrapper/gradlew not found"
-    exit -2
-fi
-. $PROJECT_HOME/gradlew assembleDebug
-
-# cleaning up
-cd $PROJECT_HOME/OpenKeychain/build/outputs/apk
-if [ ! -f OpenKeychain-debug.apk ]; then
-    echo 'OpenKeychain-debug.apk was not found'
-    exit -3
-fi
-
-echo 'Build script ended successfully'
-echo -n 'apk is available at: '
-echo "$PROJECT_HOME/OpenKeychain/build/outputs/apk/OpenKeychain-debug.apk"
-exit 0
-#+END_SRC
-
-Save and exit with *CTRL-o*, *CTRL-x*.
-
-#+BEGIN_SRC bash
-chmod +x build.sh
-./build.sh
-#+END_SRC
-
-Build script for K9:
-
-#+BEGIN_SRC bash
-cd ~/develop
-git clone https://github.com/k9mail/k-9
-cd k-9
-cd tools
-nano build.sh
-#+END_SRC
-
-Then add the following:
-
-#+BEGIN_SRC bash
-#!/bin/bash
-
-# This script is intended to be used on Debian systems for building
-# the project. It has been tested with Debian 8
-
-USERNAME=$USER
-SIGNING_NAME='k-9'
-SDK_VERSION='r24.3.3'
-SDK_DIR=$HOME/android-sdk
-
-cd ..
-
-PROJECT_HOME=$(pwd)
-
-sudo apt-get install build-essential default-jdk \
-     lib32stdc++6 lib32z1 lib32z1-dev
-
-if [ ! -d $SDK_DIR ]; then
-    mkdir -p $SDK_DIR
-fi
-cd $SDK_DIR
-
-# download the SDK
-if [ ! -f $SDK_DIR/android-sdk_$SDK_VERSION-linux.tgz ]; then
-    wget https://dl.google.com/android/android-sdk_$SDK_VERSION-linux.tgz
-    tar -xzvf android-sdk_$SDK_VERSION-linux.tgz
-fi
-SDK_DIR=$SDK_DIR/android-sdk-linux
-
-echo 'Check that you have the SDK tools installed for Android 17, SDK 19.1'
-if [ ! -f $SDK_DIR/tools/android ]; then
-    echo "$SDK_DIR/tools/android not found"
-    exit -1
-fi
-cd $SDK_DIR
-chmod -R 0755 $SDK_DIR
-chmod a+rx $SDK_DIR/tools
-
-ANDROID_HOME=$SDK_DIR
-echo "sdk.dir=$SDK_DIR" > $ANDROID_HOME/local.properties
-PATH=${PATH}:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools
-
-android sdk
-cd $PROJECT_HOME
-
-if [ ! -f $SDK_DIR/tools/templates/gradle/wrapper/gradlew ]; then
-    echo "$SDK_DIR/tools/templates/gradle/wrapper/gradlew not found"
-    exit -2
-fi
-. $PROJECT_HOME/gradlew assembleDebug
-
-# cleaning up
-cd $PROJECT_HOME/k9mail/build/outputs/apk
-if [ ! -f k9mail-debug.apk ]; then
-    echo 'k9mail-debug.apk was not found'
-    exit -3
-fi
-echo 'Build script ended successfully'
-echo -n 'apk is available at: '
-echo "$PROJECT_HOME/k9mail/build/outputs/apk/k9mail-debug.apk"
-exit 0
-#+END_SRC
-
-Save and exit with *CTRL-o*, *CTRL-x*.
-
-#+BEGIN_SRC bash
-chmod +x build.sh
-./build.sh
-#+END_SRC
-
-*** Import your GPG key into OpenKeychain
-With your device connected to a laptop via USB cable and with USB debugging enabled on it:
-
-#+BEGIN_SRC bash
-ssh username@domainname -p 2222
-gpg --list-keys username@domainname
-gpg --output ~/public_key.gpg --armor --export KEY_ID
-gpg --output ~/private_key.gpg --armor --export-secret-key KEY_ID
-cat ~/public_key.gpg ~/private_key.gpg > ~/mygpgkey.asc
-exit
-scp -P 2222 username@domainname:/home/username/mygpgkey.asc ~/
-sudo apt-get install android-tools-adb
-push ~/mygpgkey.asc /sdcard/
-shred -zu ~/mygpgkey.asc
-#+END_SRC
-
-Then on your device select OpenKeychain and import your key from file.
-*** Incoming server settings
- * Select settings/account settings
- * Select Fetching mail/incoming server
- * Enter your username and password
- * IMAP server should be your domain name
- * Security: SSL/TLS (always)
- * Authentication: Plain
- * Port: 993
-*** Outgoing (SMTP) server settings
- * Select settings/account settings
- * Select Sending mail/outgoing server
- * Set SMTP server to your domain name
- * Set Security to SSL/TLS (always)
- * Set port to 465
- * Set authentication to PLAIN
- * Enter your username and password
- * Accept the SSL certificate
-*** Crypto settings
-Select *settings*, *Account settings*, *OpenKeychain* and then select your key and press *Allow*. You should now be able to decrypt emails by entering your GPG passphrase.
-
-You may also want to change the amount of time for which passwords are remembered, so that you don't need to enter your passphrase very often.
-*** Folders
-To view any new folders which you may have created using the /mailinglistrule/ script from your inbox press the *K9 icon* at the top left to access folders, then press the *menu button* and select *refresh folder list*.
-
-If your folder still doesn't show up then press the *menu button*, select *show folders* and select *all folders*.
-
+* Android apps
+Mobile devices have a reputation for being quite insecure, so it's recommended that you don't store emails or GPG keys on your phone. Instead [[./app_mailpile.html][install Mailpile]] and access your email via the webmail interface.
 * Subscribing to mailing lists
 To subscribe to a mailing list log in as your user (i.e. not the root user).
 
@@ -452,19 +222,5 @@ ssh username@domainname -p 2222
 #+END_SRC
 
 Select /Administrator controls/ then *Email filtering rules* then *Block/Unblock and email address* or *Block/Unblock email with subject line*. Also see the manpage for *freedombone-ignore*.
-* Your own mailing list
-If you want to set up a public mailing list then when installing the system remember to set the *PUBLIC_MAILING_LIST* variable within *freedombone.cfg* to the name of your list. The name should have no spaces in it. Public mailing lists are unencrypted so anyone will be able to read the contents, including non subscribers.
-
-To subscribe to your list send a cleartext email to:
-
-#+BEGIN_SRC bash
-mymailinglistname+subscribe@domainname
-#+END_SRC
-
-Tip: When using the Mutt email client if you want to send an email in cleartext then press *p* (for PGP) on the sending screen and select *clear*. Unsecure email is treated as being the exception rather than the default.
-
-#+BEGIN_EXPORT html
-<center>
-Return to the <a href="index.html">home page</a>
-</center>
-#+END_EXPORT
+* Using I2P for email transport
+For the most paranoid use cases it is also possible to use I2P as an email transport mechanism. This will of course require the people you're communicating with to have a similar setup in place. For details see the [[./app_bdsmail.html][bdsmail app]]. An advantage of this is that it's very unlikely that your email will get blocked. The disadvantage is that few others will be capable of receiving email this way, and it's only really usable via the Mutt email client.

doc/EN/users.org

@@ -0,0 +1,21 @@
+#+TITLE:
+#+AUTHOR: Bob Mottram
+#+EMAIL: bob@freedombone.net
+#+KEYWORDS: freedombone, debian, beaglebone, users
+#+DESCRIPTION: Adding or removing users
+#+OPTIONS: ^:nil toc:nil
+#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="freedombone.css" />
+
+#+BEGIN_CENTER
+[[file:images/logo.png]]
+#+END_CENTER
+
+Log into the system with:
+
+#+BEGIN_SRC bash
+ssh username@domainname -p 2222
+#+END_SRC
+
+Select *Administrator controls* then *User Management*.
+
+[[file:images/controlpanel/control_panel_manage_users.jpg]]

src/freedombone

@@ -77,6 +77,12 @@ if [[ "$command_options" == "menuconfig-postactiv" ]]; then
     SOCIALINSTANCE='postactiv'
 fi
 
+if [[ "$command_options" == "menuconfig-pleroma" ]]; then
+    MINIMAL_INSTALL="yes"
+    ONION_ONLY="no"
+    SOCIALINSTANCE='pleroma'
+fi
+
 if [ ! "$CONFIGURATION_FILE" ]; then
     CONFIGURATION_FILE="$HOME/${PROJECT_NAME}.cfg"
 fi

src/freedombone-app-gnusocial

@@ -611,6 +611,8 @@ function remove_gnusocial {
     if grep -q 'gnusocial-firewall' /etc/crontab; then
         sed -i '/gnusocial-firewall/d' /etc/crontab
     fi
+    sed -i 's|mysqli.allow_persistent.*|mysqli.allow_persistent = On|g' /etc/php/7.0/cli/php.ini
+    sed -i 's|mysqli.reconnect.*|mysqli.reconnect = Off|g' /etc/php/7.0/cli/php.ini
 
     function_check remove_ddns_domain
     remove_ddns_domain "$GNUSOCIAL_DOMAIN_NAME"
@@ -888,6 +890,15 @@ function install_gnusocial_main {
     # This improves performance
     sed -i "s|//\$config\\['db'\\]\\['schemacheck'\\].*|\$config\\['db'\\]\\['schemacheck'\\] = 'script';|g" "$gnusocial_config_file"
 
+    # remove the install script
+    if [ -f "/var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/install.php" ]; then
+        rm "/var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/install.php"
+    fi
+
+    # php configuration
+    sed -i 's|mysqli.allow_persistent.*|mysqli.allow_persistent = On|g' /etc/php/7.0/cli/php.ini
+    sed -i 's|mysqli.reconnect.*|mysqli.reconnect = On|g' /etc/php/7.0/cli/php.ini
+
     systemctl restart mariadb
     systemctl restart php7.0-fpm
     systemctl restart nginx

src/freedombone-app-pleroma

@@ -47,7 +47,7 @@ PLEROMA_CODE=
 PLEROMA_PORT=4000
 PLEROMA_ONION_PORT=8011
 PLEROMA_REPO="https://git.pleroma.social/pleroma/pleroma.git"
-PLEROMA_COMMIT='b0d242cd9220c22c0af7c153182a51d8e40d34ba'
+PLEROMA_COMMIT='312a8783f8dbf563ea9d5af3cc7991ca553dc286'
 PLEROMA_ADMIN_PASSWORD=
 PLEROMA_DIR=/etc/pleroma
 PLEROMA_SECRET_KEY=""
@@ -769,6 +769,8 @@ function upgrade_pleroma {
     expire_pleroma_posts "$PLEROMA_DOMAIN_NAME" "$PLEROMA_EXPIRE_MONTHS"
     create_pleroma_blocklist
 
+    chown -R pleroma:pleroma $PLEROMA_DIR
+
     systemctl restart pleroma
 }
 
@@ -902,7 +904,7 @@ function remove_pleroma {
     rm /etc/systemd/system/pleroma.service
 
     userdel pleroma
-    #apt-get -yq remove esl-erlang elixir erlang-xmerl erlang-dev erlang-parsetools
+    #remove_elixir
 
     function_check remove_nodejs
     remove_nodejs pleroma-backend
@@ -936,30 +938,6 @@ function remove_pleroma {
     remove_ddns_domain "$PLEROMA_DOMAIN_NAME"
 }
 
-function install_elixir {
-    apt-get -yq install wget build-essential
-
-    if [ ! -d "$INSTALL_DIR" ]; then
-        mkdir -p "$INSTALL_DIR"
-    fi
-
-    cd "$INSTALL_DIR" || exit 768345274
-    erlang_package=erlang-solutions_1.0_all.deb
-    wget https://packages.erlang-solutions.com/$erlang_package
-    if [ ! -f "$INSTALL_DIR/$erlang_package" ]; then
-        exit 72853
-    fi
-    dpkg -i $erlang_package
-    apt-get -yq update
-    apt-get -yq install esl-erlang
-    apt-get -yq install elixir erlang-xmerl erlang-dev erlang-parsetools
-
-    if [ ! -f /usr/local/bin/mix ]; then
-        echo $'/usr/local/bin/mix not found after elixir installation'
-        exit 629352
-    fi
-}
-
 function install_pleroma {
     if [ ! $ONION_ONLY ]; then
         ONION_ONLY='no'

src/freedombone-app-postactiv

@@ -624,6 +624,8 @@ function remove_postactiv {
     remove_backup_database_local postactiv
 
     sed -i '/postactiv-firewall/d' /etc/crontab
+    sed -i 's|mysqli.allow_persistent.*|mysqli.allow_persistent = On|g' /etc/php/7.0/cli/php.ini
+    sed -i 's|mysqli.reconnect.*|mysqli.reconnect = Off|g' /etc/php/7.0/cli/php.ini
 
     function_check remove_ddns_domain
     remove_ddns_domain "$POSTACTIV_DOMAIN_NAME"
@@ -653,6 +655,9 @@ function install_postactiv_main {
 
     apt-get -yq install php-gettext php-curl php-gd php-mysql git curl
     apt-get -yq install memcached php-memcached php-intl exiftool libfcgi0ldbl
+    apt-get -yq install php7.0-bcmath php7.0-curl php7.0-exif php7.0-gd
+    apt-get -yq install php7.0-intl php7.0-mbstring php7.0-mysqlnd
+    apt-get -yq install php7.0-opcache php7.0-readline php7.0-xmlwriter
 
     if [ ! -d "/var/www/$POSTACTIV_DOMAIN_NAME" ]; then
         mkdir "/var/www/$POSTACTIV_DOMAIN_NAME"
@@ -905,6 +910,10 @@ function install_postactiv_main {
         rm "/var/www/$POSTACTIV_DOMAIN_NAME/htdocs/install.php"
     fi
 
+    # php configuration
+    sed -i 's|mysqli.allow_persistent.*|mysqli.allow_persistent = On|g' /etc/php/7.0/cli/php.ini
+    sed -i 's|mysqli.reconnect.*|mysqli.reconnect = On|g' /etc/php/7.0/cli/php.ini
+
     systemctl restart mariadb
     systemctl restart php7.0-fpm
     systemctl restart nginx

src/freedombone-config

@@ -1142,6 +1142,15 @@ function interactive_config {
         install_postactiv
     fi
 
+    if [[ "$SOCIALINSTANCE" == 'pleroma' ]]; then
+        PLEROMA_DOMAIN_NAME=$DEFAULT_DOMAIN_NAME
+        PLEROMA_CODE=$DEFAULT_DOMAIN_CODE
+        write_config_param "PLEROMA_DOMAIN_NAME" "$PLEROMA_DOMAIN_NAME"
+        write_config_param "PLEROMA_CODE" "$PLEROMA_CODE"
+        write_config_param "SOCIALINSTANCE" "$SOCIALINSTANCE"
+        install_pleroma
+    fi
+
     # delete the temporary configuration file
     if [ -f temp.cfg ]; then
         shred -zu temp.cfg

src/freedombone-image

@@ -563,7 +563,7 @@ if [[ $AMNESIC != 'no' ]]; then
     IMAGE_NAME="${IMAGE_NAME}-amnesic"
 fi
 
-if [[ "$SOCIALINSTANCE" == "gnusocial" || "$SOCIALINSTANCE" == "postactiv" ]]; then
+if [[ "$SOCIALINSTANCE" == "gnusocial" || "$SOCIALINSTANCE" == "postactiv" || "$SOCIALINSTANCE" == "pleroma" ]]; then
     IMAGE_NAME="${IMAGE_NAME}-${SOCIALINSTANCE}"
 fi
 

src/freedombone-image-customise

@@ -395,14 +395,18 @@ EOF
             if [[ "$SOCIALINSTANCE" == "postactiv" ]]; then
                 echo "    ${PROJECT_NAME} menuconfig-postactiv" >> "$rootdir/root/.bashrc"
             else
-                if [[ "$ONION_ONLY" == "no" ]]; then
-                    if [[ "$MINIMAL_INSTALL" == "no" ]]; then
-                        echo "    ${PROJECT_NAME} menuconfig-full" >> "$rootdir/root/.bashrc"
+                if [[ "$SOCIALINSTANCE" == "pleroma" ]]; then
+                    echo "    ${PROJECT_NAME} menuconfig-pleroma" >> "$rootdir/root/.bashrc"
+                else
+                    if [[ "$ONION_ONLY" == "no" ]]; then
+                        if [[ "$MINIMAL_INSTALL" == "no" ]]; then
+                            echo "    ${PROJECT_NAME} menuconfig-full" >> "$rootdir/root/.bashrc"
+                        else
+                            echo "    ${PROJECT_NAME} menuconfig" >> "$rootdir/root/.bashrc"
+                        fi
                     else
-                        echo "    ${PROJECT_NAME} menuconfig" >> "$rootdir/root/.bashrc"
+                        echo "    ${PROJECT_NAME} menuconfig-onion" >> "$rootdir/root/.bashrc"
                     fi
-                else
-                    echo "    ${PROJECT_NAME} menuconfig-onion" >> "$rootdir/root/.bashrc"
                 fi
             fi
         fi
@@ -1917,8 +1921,6 @@ image_preinstall_repos() {
 
     if [[ "$SOCIALINSTANCE" == "pleroma" ]]; then
         git clone "$PLEROMA_REPO" "$rootdir/repos/pleroma"
-        git clone "$QVITTER_THEME_REPO" "$rootdir/repos/qvitter"
-        git clone "$PLEROMA_FRONTEND_REPO" "$rootdir/repos/pleroma-fe"
         return
     fi
 
@@ -1953,7 +1955,6 @@ image_preinstall_repos() {
     git clone "$HUBZILLA_REPO" "$rootdir/repos/hubzilla"
     git clone "$HUBZILLA_ADDONS_REPO" "$rootdir/repos/hubzilla-addons"
     git clone "$KOEL_REPO" "$rootdir/repos/koel"
-    #git clone "$LIBREVAULT_REPO" "$rootdir/repos/librevault"
     git clone "$LYCHEE_REPO" "$rootdir/repos/lychee"
     git clone "$MAILPILE_REPO" "$rootdir/repos/mailpile"
     git clone "$MATRIX_REPO" "$rootdir/repos/matrix"
@@ -2161,6 +2162,7 @@ create_generic_image
 atheros_wifi
 continue_installation
 image_install_nodejs
+image_install_elixir
 initialise_mesh
 configure_wifi
 configure_user_interface

src/freedombone-utils-elixir

@@ -0,0 +1,100 @@
+#!/bin/bash
+#
+# .---.                  .              .
+# |                      |              |
+# |--- .--. .-.  .-.  .-.|  .-. .--.--. |.-.  .-. .--.  .-.
+# |    |   (.-' (.-' (   | (   )|  |  | |   )(   )|  | (.-'
+# '    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'
+#
+#                    Freedom in the Cloud
+#
+# Elixir functions
+#
+# There's a problem with installing this onto mesh images, which is
+# that qemu appears to run out of RAM when using yarn to add webpack.
+#
+# License
+# =======
+#
+# Copyright (C) 2018 Bob Mottram <bob@freedombone.net>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+erlang_package='erlang-solutions_1.0_all.deb'
+
+function remove_elixir {
+    apt-get -yq remove elixir erlang-xmerl erlang-dev erlang-parsetools
+    apt-get -yq remove esl-erlang
+}
+
+function install_elixir {
+    if [ -f /usr/local/bin/mix ]; then
+        return
+    fi
+
+    apt-get -yq install wget build-essential
+
+    if [ ! -d "$INSTALL_DIR" ]; then
+        mkdir -p "$INSTALL_DIR"
+    fi
+
+    cd "$INSTALL_DIR" || exit 768345274
+    wget https://packages.erlang-solutions.com/$erlang_package
+    if [ ! -f "$INSTALL_DIR/$erlang_package" ]; then
+        exit 72853
+    fi
+    dpkg -i $erlang_package
+    apt-get -yq update
+    apt-get -yq install esl-erlang
+    apt-get -yq install elixir erlang-xmerl erlang-dev erlang-parsetools
+
+    if [ ! -f /usr/local/bin/mix ]; then
+        echo $'/usr/local/bin/mix not found after elixir installation'
+        exit 629352
+    fi
+}
+
+function image_install_elixir {
+    if [[ $VARIANT == "mesh"* ]]; then
+        return
+    fi
+
+    # shellcheck disable=SC2154
+    chroot "$rootdir" apt-get -yq install wget build-essential
+
+    if [ ! -d "$rootdir$INSTALL_DIR" ]; then
+        mkdir -p "$rootdir$INSTALL_DIR"
+    fi
+
+    { echo '#!/bin/bash';
+      echo "cd $INSTALL_DIR || exit 1";
+      echo "erlang_package=$erlang_package";
+      echo "wget https://packages.erlang-solutions.com/\$erlang_package";
+      echo "if [ ! -f \"$INSTALL_DIR/\$erlang_package\" ]; then";
+      echo '    exit 2';
+      echo 'fi';
+      echo "dpkg -i \$erlang_package"; } > "$rootdir/usr/bin/install_elixir"
+    chmod +x "$rootdir/usr/bin/install_elixir"
+    chroot "$rootdir" /usr/bin/install_elixir
+    chroot "$rootdir" apt-get -yq update
+    chroot "$rootdir" apt-get -yq install esl-erlang
+    chroot "$rootdir" apt-get -yq install elixir erlang-xmerl erlang-dev erlang-parsetools
+
+    if [ ! -f "$rootdir/usr/local/bin/mix" ]; then
+        echo $'/usr/local/bin/mix not found after elixir installation'
+        exit 629352
+    fi
+}
+
+# NOTE: deliberately no exit 0

website/EN/app_pleroma.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-02-21 Wed 16:16 -->
+<!-- 2018-03-13 Tue 12:58 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>&lrm;</title>
@@ -274,9 +274,9 @@ Some general advice about life in the fediverse <a href="./fediverse.html">can b
 </div>
 </div>
 
-<div id="outline-container-orgb538b49" class="outline-2">
-<h2 id="orgb538b49">Installation</h2>
-<div class="outline-text-2" id="text-orgb538b49">
+<div id="outline-container-org0494ed4" class="outline-2">
+<h2 id="org0494ed4">Installation</h2>
+<div class="outline-text-2" id="text-org0494ed4">
 <p>
 Log into your system with:
 </p>
@@ -296,9 +296,9 @@ Select <b>Add/Remove Apps</b> then <b>pleroma</b>. You will then be asked for a
 </div>
 </div>
 
-<div id="outline-container-org9e3d185" class="outline-2">
-<h2 id="org9e3d185">Initial setup</h2>
-<div class="outline-text-2" id="text-org9e3d185">
+<div id="outline-container-org264cd33" class="outline-2">
+<h2 id="org264cd33">Initial setup</h2>
+<div class="outline-text-2" id="text-org264cd33">
 <p>
 The first thing you'll need to do is register a new account. You can set your profile details and profile image by selecting the small settings icon to the right of your name.
 </p>
@@ -309,9 +309,9 @@ Once you have done that then you can disable further registrations from the <b>A
 </div>
 </div>
 
-<div id="outline-container-orgaceec12" class="outline-2">
-<h2 id="orgaceec12">Mastodon user interface</h2>
-<div class="outline-text-2" id="text-orgaceec12">
+<div id="outline-container-org3b7289f" class="outline-2">
+<h2 id="org3b7289f">Mastodon user interface</h2>
+<div class="outline-text-2" id="text-org3b7289f">
 <p>
 If you prefer a Tweetdeck-style user interface, similar to Mastodon, then once you have registered an account navigate to <b>/yourpleromadomainname/web</b> and log in.
 </p>
@@ -326,9 +326,25 @@ If you prefer a Tweetdeck-style user interface, similar to Mastodon, then once y
 </div>
 </div>
 
-<div id="outline-container-org9162549" class="outline-2">
-<h2 id="org9162549">Blocking controls</h2>
-<div class="outline-text-2" id="text-org9162549">
+<div id="outline-container-orgb42a82b" class="outline-2">
+<h2 id="orgb42a82b">Mobile apps</h2>
+<div class="outline-text-2" id="text-orgb42a82b">
+<p>
+It's also possible to use Mastodon apps together with Pleroma, such as Tusky, since it supports the Mastodon API. You may need to install <b>IcecatMobile</b> and set it as your default browser (under <b>Settings/Apps/Menu</b>) in order for the initial oauth registration process to work.
+</p>
+
+<div class="org-center">
+
+<div class="figure">
+<p><img src="images/tusky.jpg" alt="tusky.jpg" />
+</p>
+</div>
+</div>
+</div>
+</div>
+<div id="outline-container-orgf39f4e5" class="outline-2">
+<h2 id="orgf39f4e5">Blocking controls</h2>
+<div class="outline-text-2" id="text-orgf39f4e5">
 <div class="org-center">
 
 <div class="figure">

website/EN/apps.html

@@ -3,33 +3,26 @@
 "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-02-21 Wed 15:05 -->
-<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="List of apps available on freedombone"
+<title></title>
+<!-- 2018-03-10 Sat 21:13 -->
+<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="List of apps available on freedombone"
  />
-<meta name="keywords" content="freedombone, apps" />
+<meta  name="keywords" content="freedombone, apps" />
 <style type="text/css">
  <!--/*--><![CDATA[/*><!--*/
-  .title  { text-align: center;
-             margin-bottom: .2em; }
-  .subtitle { text-align: center;
-              font-size: medium;
-              font-weight: bold;
-              margin-top:0; }
+  .title  { text-align: center; }
   .todo   { font-family: monospace; color: red; }
-  .done   { font-family: monospace; color: green; }
-  .priority { font-family: monospace; color: orange; }
+  .done   { color: green; }
   .tag    { background-color: #eee; font-family: monospace;
             padding: 2px; font-size: 80%; font-weight: normal; }
   .timestamp { color: #bebebe; }
   .timestamp-kwd { color: #5f9ea0; }
-  .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; }
+  .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; }
   .underline { text-decoration: underline; }
   #postamble p, #preamble p { font-size: 90%; margin: .2em; }
   p.verse { margin-left: 3%; }
@@ -56,111 +49,27 @@
     border: 1px solid black;
   }
   pre.src:hover:before { display: inline;}
-  /* 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-sh:before    { content: 'sh'; }
+  pre.src-bash:before  { content: 'sh'; }
   pre.src-emacs-lisp:before { content: 'Emacs Lisp'; }
-  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'; }
+  pre.src-R:before     { content: 'R'; }
+  pre.src-perl:before  { content: 'Perl'; }
+  pre.src-java:before  { content: 'Java'; }
+  pre.src-sql:before   { content: 'SQL'; }
 
   table { border-collapse:collapse; }
   caption.t-above { caption-side: top; }
   caption.t-bottom { caption-side: bottom; }
   td, th { vertical-align:top;  }
-  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; }
+  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; }
   dt { font-weight: bold; }
-  .footpara { display: inline; }
+  .footpara:nth-child(2) { display: inline; }
+  .footpara { display: block; }
   .footdef  { margin-bottom: 1em; }
   .figure { padding: 1em; }
   .figure p { text-align: center; }
@@ -180,7 +89,6 @@
     { 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" />
@@ -189,7 +97,7 @@
 @licstart  The following is the entire license notice for the
 JavaScript code in this tag.
 
-Copyright (C) 2012-2017 Free Software Foundation, Inc.
+Copyright (C) 2012-2013 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
@@ -236,7 +144,8 @@ for the JavaScript code in this tag.
 <a name="top" id="top"></a>
 </div>
 <div id="content">
-<div class="org-center">
+<h1 class="title"></h1>
+<div class="center">
 
 <div class="figure">
 <p><img src="images/logo.png" alt="logo.png" />
@@ -244,8 +153,6 @@ for the JavaScript code in this tag.
 </div>
 </div>
 
-<center><h1>Apps</h1></center>
-
 <blockquote>
 <p>
 "<i>In times of aggressive corporatization, increasing enclosure of communication spaces, and blanket surveillance, emancipatory communication practices appear to be particularly well suited to offer concrete alternatives to activists and citizens alike</i>" &#x2013; Stefania Milan
@@ -256,7 +163,7 @@ for the JavaScript code in this tag.
 The base install of the system just contains an email server and Mutt client, but not much else. In addition from within the <b>Administrator control panel</b> under <b>Add/remove apps</b> the following are installable. This list only applies on the home server version, with the mesh network version having a different and smaller set of apps.
 </p>
 
-<div class="org-center">
+<div class="center">
 
 <div class="figure">
 <p><img src="images/controlpanel/control_panel_apps.jpg" alt="control_panel_apps.jpg" />
@@ -265,9 +172,9 @@ The base install of the system just contains an email server and Mutt client, bu
 </div>
 
 
-<div id="outline-container-orga565b08" class="outline-2">
-<h2 id="orga565b08">Akaunting</h2>
-<div class="outline-text-2" id="text-orga565b08">
+<div id="outline-container-sec-1" class="outline-2">
+<h2 id="sec-1">Akaunting</h2>
+<div class="outline-text-2" id="text-1">
 <p>
 A web based accounts system for small businesses or freelancers.
 </p>
@@ -277,9 +184,9 @@ A web based accounts system for small businesses or freelancers.
 </p>
 </div>
 </div>
-<div id="outline-container-orga6c3fd1" class="outline-2">
-<h2 id="orga6c3fd1">BDS Mail</h2>
-<div class="outline-text-2" id="text-orga6c3fd1">
+<div id="outline-container-sec-2" class="outline-2">
+<h2 id="sec-2">BDS Mail</h2>
+<div class="outline-text-2" id="text-2">
 <p>
 It's like ordinary email, but with <a href="https://en.wikipedia.org/wiki/I2P">i2p</a> as the transport mechanism.
 </p>
@@ -289,9 +196,9 @@ It's like ordinary email, but with <a href="https://en.wikipedia.org/wiki/I2P">i
 </p>
 </div>
 </div>
-<div id="outline-container-org38c41a8" class="outline-2">
-<h2 id="org38c41a8">CryptPad</h2>
-<div class="outline-text-2" id="text-org38c41a8">
+<div id="outline-container-sec-3" class="outline-2">
+<h2 id="sec-3">CryptPad</h2>
+<div class="outline-text-2" id="text-3">
 <p>
 Collaborate on editing documents, presentations and source code, or vote on things. All with a good level of security.
 </p>
@@ -301,9 +208,9 @@ Collaborate on editing documents, presentations and source code, or vote on thin
 </p>
 </div>
 </div>
-<div id="outline-container-org2b6d6ac" class="outline-2">
-<h2 id="org2b6d6ac">DLNA</h2>
-<div class="outline-text-2" id="text-org2b6d6ac">
+<div id="outline-container-sec-4" class="outline-2">
+<h2 id="sec-4">DLNA</h2>
+<div class="outline-text-2" id="text-4">
 <p>
 Enables you to use the system as a music server which any DLNA compatible devices can connect to within your home network.
 </p>
@@ -313,9 +220,9 @@ Enables you to use the system as a music server which any DLNA compatible device
 </p>
 </div>
 </div>
-<div id="outline-container-org6bd9e13" class="outline-2">
-<h2 id="org6bd9e13">Dokuwiki</h2>
-<div class="outline-text-2" id="text-org6bd9e13">
+<div id="outline-container-sec-5" class="outline-2">
+<h2 id="sec-5">Dokuwiki</h2>
+<div class="outline-text-2" id="text-5">
 <p>
 A databaseless wiki system.
 </p>
@@ -325,9 +232,9 @@ A databaseless wiki system.
 </p>
 </div>
 </div>
-<div id="outline-container-orgfb65777" class="outline-2">
-<h2 id="orgfb65777">Edith</h2>
-<div class="outline-text-2" id="text-orgfb65777">
+<div id="outline-container-sec-6" class="outline-2">
+<h2 id="sec-6">Edith</h2>
+<div class="outline-text-2" id="text-6">
 <p>
 Extremely simple and distraction-free notes system.
 </p>
@@ -337,9 +244,9 @@ Extremely simple and distraction-free notes system.
 </p>
 </div>
 </div>
-<div id="outline-container-orga976ffd" class="outline-2">
-<h2 id="orga976ffd">Emacs</h2>
-<div class="outline-text-2" id="text-orga976ffd">
+<div id="outline-container-sec-7" class="outline-2">
+<h2 id="sec-7">Emacs</h2>
+<div class="outline-text-2" id="text-7">
 <p>
 If you use the Mutt client to read your email then this will set it up to use emacs for composing new mail.
 </p>
@@ -349,9 +256,17 @@ If you use the Mutt client to read your email then this will set it up to use em
 </p>
 </div>
 </div>
-<div id="outline-container-orgb91b541" class="outline-2">
-<h2 id="orgb91b541">Etherpad</h2>
-<div class="outline-text-2" id="text-orgb91b541">
+<div id="outline-container-sec-8" class="outline-2">
+<h2 id="sec-8">Email Server</h2>
+<div class="outline-text-2" id="text-8">
+<p>
+Since many apps require email registration an email server is installed by default. You can find advice on using the email system <a href="./usage_email.html">here</a>.
+</p>
+</div>
+</div>
+<div id="outline-container-sec-9" class="outline-2">
+<h2 id="sec-9">Etherpad</h2>
+<div class="outline-text-2" id="text-9">
 <p>
 Collaborate on creating documents in real time. Maybe you're planning a holiday with other family members or creating documentation for a Free Software project along with other volunteers. Etherpad is hard to beat for simplicity and speed. Only users of the system will be able to access it.
 </p>
@@ -361,9 +276,9 @@ Collaborate on creating documents in real time. Maybe you're planning a holiday
 </p>
 </div>
 </div>
-<div id="outline-container-org78a1e7a" class="outline-2">
-<h2 id="org78a1e7a">Federated wiki</h2>
-<div class="outline-text-2" id="text-org78a1e7a">
+<div id="outline-container-sec-10" class="outline-2">
+<h2 id="sec-10">Federated wiki</h2>
+<div class="outline-text-2" id="text-10">
 <p>
 A new approach to creating wiki content.
 </p>
@@ -373,9 +288,9 @@ A new approach to creating wiki content.
 </p>
 </div>
 </div>
-<div id="outline-container-org61b2eec" class="outline-2">
-<h2 id="org61b2eec">Friendica</h2>
-<div class="outline-text-2" id="text-org61b2eec">
+<div id="outline-container-sec-11" class="outline-2">
+<h2 id="sec-11">Friendica</h2>
+<div class="outline-text-2" id="text-11">
 <p>
 Federated social network system.
 </p>
@@ -385,9 +300,9 @@ Federated social network system.
 </p>
 </div>
 </div>
-<div id="outline-container-org6909894" class="outline-2">
-<h2 id="org6909894">Ghost</h2>
-<div class="outline-text-2" id="text-org6909894">
+<div id="outline-container-sec-12" class="outline-2">
+<h2 id="sec-12">Ghost</h2>
+<div class="outline-text-2" id="text-12">
 <p>
 Modern looking blogging system.
 </p>
@@ -397,9 +312,9 @@ Modern looking blogging system.
 </p>
 </div>
 </div>
-<div id="outline-container-orgd3295e2" class="outline-2">
-<h2 id="orgd3295e2">GNU Social</h2>
-<div class="outline-text-2" id="text-orgd3295e2">
+<div id="outline-container-sec-13" class="outline-2">
+<h2 id="sec-13">GNU Social</h2>
+<div class="outline-text-2" id="text-13">
 <p>
 Federated social network based on the OStatus protocol. You can "<i>remote follow</i>" other users within the GNU Social federation.
 </p>
@@ -409,9 +324,9 @@ Federated social network based on the OStatus protocol. You can "<i>remote follo
 </p>
 </div>
 </div>
-<div id="outline-container-orgf9c3325" class="outline-2">
-<h2 id="orgf9c3325">Gogs</h2>
-<div class="outline-text-2" id="text-orgf9c3325">
+<div id="outline-container-sec-14" class="outline-2">
+<h2 id="sec-14">Gogs</h2>
+<div class="outline-text-2" id="text-14">
 <p>
 Lightweight git project hosting system. You can mirror projects from Github, or if Github turns evil then just host your own projects while retaining the familiar <i>fork-and-pull</i> workflow. If you can use Github then you can also use Gogs.
 </p>
@@ -421,9 +336,9 @@ Lightweight git project hosting system. You can mirror projects from Github, or
 </p>
 </div>
 </div>
-<div id="outline-container-orgfde0d6d" class="outline-2">
-<h2 id="orgfde0d6d">HTMLy</h2>
-<div class="outline-text-2" id="text-orgfde0d6d">
+<div id="outline-container-sec-15" class="outline-2">
+<h2 id="sec-15">HTMLy</h2>
+<div class="outline-text-2" id="text-15">
 <p>
 Databaseless blogging system. Quite simple and with a markdown-like format.
 </p>
@@ -433,9 +348,9 @@ Databaseless blogging system. Quite simple and with a markdown-like format.
 </p>
 </div>
 </div>
-<div id="outline-container-org28717c9" class="outline-2">
-<h2 id="org28717c9">Hubzilla</h2>
-<div class="outline-text-2" id="text-org28717c9">
+<div id="outline-container-sec-16" class="outline-2">
+<h2 id="sec-16">Hubzilla</h2>
+<div class="outline-text-2" id="text-16">
 <p>
 Web publishing platform with social network like features and good privacy controls so that it's possible to specify who can see which content. Includes photo albums, calendar, wiki and file storage.
 </p>
@@ -445,9 +360,9 @@ Web publishing platform with social network like features and good privacy contr
 </p>
 </div>
 </div>
-<div id="outline-container-org8b67211" class="outline-2">
-<h2 id="org8b67211">Icecast media stream</h2>
-<div class="outline-text-2" id="text-org8b67211">
+<div id="outline-container-sec-17" class="outline-2">
+<h2 id="sec-17">Icecast media stream</h2>
+<div class="outline-text-2" id="text-17">
 <p>
 Make your own internet radio station.
 </p>
@@ -457,9 +372,9 @@ Make your own internet radio station.
 </p>
 </div>
 </div>
-<div id="outline-container-org620e0a2" class="outline-2">
-<h2 id="org620e0a2">IRC Server (ngirc)</h2>
-<div class="outline-text-2" id="text-org620e0a2">
+<div id="outline-container-sec-18" class="outline-2">
+<h2 id="sec-18">IRC Server (ngirc)</h2>
+<div class="outline-text-2" id="text-18">
 <p>
 Run your own IRC chat channel which can be secured with a password and accessible via an onion address. A bouncer is included so that you can receive messages sent while you were offline. Works with Hexchat and other popular clients.
 </p>
@@ -469,18 +384,18 @@ Run your own IRC chat channel which can be secured with a password and accessibl
 </p>
 </div>
 </div>
-<div id="outline-container-orgaf23bf9" class="outline-2">
-<h2 id="orgaf23bf9">Jitsi Meet</h2>
-<div class="outline-text-2" id="text-orgaf23bf9">
+<div id="outline-container-sec-19" class="outline-2">
+<h2 id="sec-19">Jitsi Meet</h2>
+<div class="outline-text-2" id="text-19">
 <p>
 Experimental WebRTC video conferencing system, similar to Google Hangouts. This may not be fully functional, but is hoped to be in the near future.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org24aec82" class="outline-2">
-<h2 id="org24aec82">KanBoard</h2>
-<div class="outline-text-2" id="text-org24aec82">
+<div id="outline-container-sec-20" class="outline-2">
+<h2 id="sec-20">KanBoard</h2>
+<div class="outline-text-2" id="text-20">
 <p>
 A simple kanban system for managing projects or TODO lists.
 </p>
@@ -490,9 +405,9 @@ A simple kanban system for managing projects or TODO lists.
 </p>
 </div>
 </div>
-<div id="outline-container-org45a3c93" class="outline-2">
-<h2 id="org45a3c93">Key Server</h2>
-<div class="outline-text-2" id="text-org45a3c93">
+<div id="outline-container-sec-21" class="outline-2">
+<h2 id="sec-21">Key Server</h2>
+<div class="outline-text-2" id="text-21">
 <p>
 An OpenPGP key server for storing and retrieving GPG public keys.
 </p>
@@ -502,9 +417,9 @@ An OpenPGP key server for storing and retrieving GPG public keys.
 </p>
 </div>
 </div>
-<div id="outline-container-org0a24944" class="outline-2">
-<h2 id="org0a24944">Koel</h2>
-<div class="outline-text-2" id="text-org0a24944">
+<div id="outline-container-sec-22" class="outline-2">
+<h2 id="sec-22">Koel</h2>
+<div class="outline-text-2" id="text-22">
 <p>
 Access your music collection from any internet connected device.
 </p>
@@ -514,9 +429,9 @@ Access your music collection from any internet connected device.
 </p>
 </div>
 </div>
-<div id="outline-container-org3a2e6f7" class="outline-2">
-<h2 id="org3a2e6f7">Lychee</h2>
-<div class="outline-text-2" id="text-org3a2e6f7">
+<div id="outline-container-sec-23" class="outline-2">
+<h2 id="sec-23">Lychee</h2>
+<div class="outline-text-2" id="text-23">
 <p>
 Make your photo albums available on the web.
 </p>
@@ -526,9 +441,9 @@ Make your photo albums available on the web.
 </p>
 </div>
 </div>
-<div id="outline-container-org2ce1251" class="outline-2">
-<h2 id="org2ce1251">Mailpile</h2>
-<div class="outline-text-2" id="text-org2ce1251">
+<div id="outline-container-sec-24" class="outline-2">
+<h2 id="sec-24">Mailpile</h2>
+<div class="outline-text-2" id="text-24">
 <p>
 Modern email client which supports GPG encryption.
 </p>
@@ -538,9 +453,9 @@ Modern email client which supports GPG encryption.
 </p>
 </div>
 </div>
-<div id="outline-container-orgc7cd13f" class="outline-2">
-<h2 id="orgc7cd13f">Matrix</h2>
-<div class="outline-text-2" id="text-orgc7cd13f">
+<div id="outline-container-sec-25" class="outline-2">
+<h2 id="sec-25">Matrix</h2>
+<div class="outline-text-2" id="text-25">
 <p>
 Multi-user chat with some security and moderation controls.
 </p>
@@ -550,9 +465,9 @@ Multi-user chat with some security and moderation controls.
 </p>
 </div>
 </div>
-<div id="outline-container-orgddb22c7" class="outline-2">
-<h2 id="orgddb22c7">Mediagoblin</h2>
-<div class="outline-text-2" id="text-orgddb22c7">
+<div id="outline-container-sec-26" class="outline-2">
+<h2 id="sec-26">Mediagoblin</h2>
+<div class="outline-text-2" id="text-26">
 <p>
 Publicly host video and audio files so that you don't need to use YouTube/Vimeo/etc.
 </p>
@@ -562,9 +477,9 @@ Publicly host video and audio files so that you don't need to use YouTube/Vimeo/
 </p>
 </div>
 </div>
-<div id="outline-container-org3443452" class="outline-2">
-<h2 id="org3443452">Mumble</h2>
-<div class="outline-text-2" id="text-org3443452">
+<div id="outline-container-sec-27" class="outline-2">
+<h2 id="sec-27">Mumble</h2>
+<div class="outline-text-2" id="text-27">
 <p>
 The popular VoIP and text chat system. Say goodbye to old-fashioned telephony conferences with silly dial codes. Also works well on mobile.
 </p>
@@ -574,9 +489,9 @@ The popular VoIP and text chat system. Say goodbye to old-fashioned telephony co
 </p>
 </div>
 </div>
-<div id="outline-container-org41c4d06" class="outline-2">
-<h2 id="org41c4d06">NextCloud</h2>
-<div class="outline-text-2" id="text-org41c4d06">
+<div id="outline-container-sec-28" class="outline-2">
+<h2 id="sec-28">NextCloud</h2>
+<div class="outline-text-2" id="text-28">
 <p>
 Store files on your server and sync them with laptops or mobile devices. Includes many plugins including videoconferencing and collaborative document editing.
 </p>
@@ -586,9 +501,9 @@ Store files on your server and sync them with laptops or mobile devices. Include
 </p>
 </div>
 </div>
-<div id="outline-container-org0b5e2de" class="outline-2">
-<h2 id="org0b5e2de">PeerTube</h2>
-<div class="outline-text-2" id="text-org0b5e2de">
+<div id="outline-container-sec-29" class="outline-2">
+<h2 id="sec-29">PeerTube</h2>
+<div class="outline-text-2" id="text-29">
 <p>
 Peer-to-peer video hosting. Similar to Mediagoblin, but the P2P aspect better enables the streaming load to be shared across servers.
 </p>
@@ -598,9 +513,9 @@ Peer-to-peer video hosting. Similar to Mediagoblin, but the P2P aspect better en
 </p>
 </div>
 </div>
-<div id="outline-container-orgbc69da3" class="outline-2">
-<h2 id="orgbc69da3">PI-Hole</h2>
-<div class="outline-text-2" id="text-orgbc69da3">
+<div id="outline-container-sec-30" class="outline-2">
+<h2 id="sec-30">PI-Hole</h2>
+<div class="outline-text-2" id="text-30">
 <p>
 The black hole for web adverts. Block adverts at the domain name level within your local network. It can significantly reduce bandwidth, speed up page load times and protect your systems from being tracked by spyware.
 </p>
@@ -610,9 +525,9 @@ The black hole for web adverts. Block adverts at the domain name level within yo
 </p>
 </div>
 </div>
-<div id="outline-container-orgae7a92d" class="outline-2">
-<h2 id="orgae7a92d">Pleroma</h2>
-<div class="outline-text-2" id="text-orgae7a92d">
+<div id="outline-container-sec-31" class="outline-2">
+<h2 id="sec-31">Pleroma</h2>
+<div class="outline-text-2" id="text-31">
 <p>
 Fediverse instance which is compatible with GNU Social and Mastodon, and suited for systems without much RAM or CPU resource.
 </p>
@@ -622,9 +537,9 @@ Fediverse instance which is compatible with GNU Social and Mastodon, and suited
 </p>
 </div>
 </div>
-<div id="outline-container-org94767b4" class="outline-2">
-<h2 id="org94767b4">PostActiv</h2>
-<div class="outline-text-2" id="text-org94767b4">
+<div id="outline-container-sec-32" class="outline-2">
+<h2 id="sec-32">PostActiv</h2>
+<div class="outline-text-2" id="text-32">
 <p>
 An alternative federated social networking system compatible with GNU Social, Pleroma and Mastodon. It includes some optimisations and fixes currently not available within the main GNU Social project.
 </p>
@@ -634,9 +549,9 @@ An alternative federated social networking system compatible with GNU Social, Pl
 </p>
 </div>
 </div>
-<div id="outline-container-org0ba2849" class="outline-2">
-<h2 id="org0ba2849">PrivateBin</h2>
-<div class="outline-text-2" id="text-org0ba2849">
+<div id="outline-container-sec-33" class="outline-2">
+<h2 id="sec-33">PrivateBin</h2>
+<div class="outline-text-2" id="text-33">
 <p>
 A pastebin where the server has zero knowledge of the content being pasted.
 </p>
@@ -646,9 +561,9 @@ A pastebin where the server has zero knowledge of the content being pasted.
 </p>
 </div>
 </div>
-<div id="outline-container-orgcd96abb" class="outline-2">
-<h2 id="orgcd96abb">Profanity</h2>
-<div class="outline-text-2" id="text-orgcd96abb">
+<div id="outline-container-sec-34" class="outline-2">
+<h2 id="sec-34">Profanity</h2>
+<div class="outline-text-2" id="text-34">
 <p>
 A shell based XMPP client which you can run on the Freedombone server via ssh.
 </p>
@@ -658,9 +573,9 @@ A shell based XMPP client which you can run on the Freedombone server via ssh.
 </p>
 </div>
 </div>
-<div id="outline-container-orgb9c3c0b" class="outline-2">
-<h2 id="orgb9c3c0b">Riot Web</h2>
-<div class="outline-text-2" id="text-orgb9c3c0b">
+<div id="outline-container-sec-35" class="outline-2">
+<h2 id="sec-35">Riot Web</h2>
+<div class="outline-text-2" id="text-35">
 <p>
 A browser based user interface for the Matrix federated communications system, including WebRTC audio and video chat.
 </p>
@@ -670,9 +585,9 @@ A browser based user interface for the Matrix federated communications system, i
 </p>
 </div>
 </div>
-<div id="outline-container-orgd05631d" class="outline-2">
-<h2 id="orgd05631d">SearX</h2>
-<div class="outline-text-2" id="text-orgd05631d">
+<div id="outline-container-sec-36" class="outline-2">
+<h2 id="sec-36">SearX</h2>
+<div class="outline-text-2" id="text-36">
 <p>
 A metasearch engine for customised and private web searches.
 </p>
@@ -682,9 +597,9 @@ A metasearch engine for customised and private web searches.
 </p>
 </div>
 </div>
-<div id="outline-container-org2a1819a" class="outline-2">
-<h2 id="org2a1819a">tt-rss</h2>
-<div class="outline-text-2" id="text-org2a1819a">
+<div id="outline-container-sec-37" class="outline-2">
+<h2 id="sec-37">tt-rss</h2>
+<div class="outline-text-2" id="text-37">
 <p>
 Private RSS reader. Pulls in RSS/Atom feeds via Tor and is only accessible via an onion address. Have "<i>the right to read</i>" without the Surveillance State knowing what you're reading. Also available with a user interface suitable for viewing on mobile devices via a browser such as OrFox.
 </p>
@@ -694,9 +609,9 @@ Private RSS reader. Pulls in RSS/Atom feeds via Tor and is only accessible via a
 </p>
 </div>
 </div>
-<div id="outline-container-org7325a35" class="outline-2">
-<h2 id="org7325a35">Syncthing</h2>
-<div class="outline-text-2" id="text-org7325a35">
+<div id="outline-container-sec-38" class="outline-2">
+<h2 id="sec-38">Syncthing</h2>
+<div class="outline-text-2" id="text-38">
 <p>
 Possibly the best way to synchronise files across all of your devices. Once it has been set up it "just works" with no user intervention needed.
 </p>
@@ -706,9 +621,9 @@ Possibly the best way to synchronise files across all of your devices. Once it h
 </p>
 </div>
 </div>
-<div id="outline-container-orge582914" class="outline-2">
-<h2 id="orge582914">Tahoe-LAFS</h2>
-<div class="outline-text-2" id="text-orge582914">
+<div id="outline-container-sec-39" class="outline-2">
+<h2 id="sec-39">Tahoe-LAFS</h2>
+<div class="outline-text-2" id="text-39">
 <p>
 Robust and encrypted storage of files on one or more server.
 </p>
@@ -718,9 +633,9 @@ Robust and encrypted storage of files on one or more server.
 </p>
 </div>
 </div>
-<div id="outline-container-org0f44920" class="outline-2">
-<h2 id="org0f44920">Tox</h2>
-<div class="outline-text-2" id="text-org0f44920">
+<div id="outline-container-sec-40" class="outline-2">
+<h2 id="sec-40">Tox</h2>
+<div class="outline-text-2" id="text-40">
 <p>
 Client and bootstrap node for the Tox chat/VoIP system.
 </p>
@@ -730,9 +645,9 @@ Client and bootstrap node for the Tox chat/VoIP system.
 </p>
 </div>
 </div>
-<div id="outline-container-org9e5e0ed" class="outline-2">
-<h2 id="org9e5e0ed">Turtl</h2>
-<div class="outline-text-2" id="text-org9e5e0ed">
+<div id="outline-container-sec-41" class="outline-2">
+<h2 id="sec-41">Turtl</h2>
+<div class="outline-text-2" id="text-41">
 <p>
 A system for privately creating and sharing notes and images, similar to Evernote but without the spying.
 </p>
@@ -742,18 +657,18 @@ A system for privately creating and sharing notes and images, similar to Evernot
 </p>
 </div>
 </div>
-<div id="outline-container-org47df89a" class="outline-2">
-<h2 id="org47df89a">Vim</h2>
-<div class="outline-text-2" id="text-org47df89a">
+<div id="outline-container-sec-42" class="outline-2">
+<h2 id="sec-42">Vim</h2>
+<div class="outline-text-2" id="text-42">
 <p>
 If you use the Mutt client to read your email then this will set it up to use vim for composing new mail.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org1ae77f6" class="outline-2">
-<h2 id="org1ae77f6">Virtual Private Network (VPN)</h2>
-<div class="outline-text-2" id="text-org1ae77f6">
+<div id="outline-container-sec-43" class="outline-2">
+<h2 id="sec-43">Virtual Private Network (VPN)</h2>
+<div class="outline-text-2" id="text-43">
 <p>
 Set up a VPN on your server so that you can bypass local internet censorship.
 </p>
@@ -763,9 +678,9 @@ Set up a VPN on your server so that you can bypass local internet censorship.
 </p>
 </div>
 </div>
-<div id="outline-container-org293b43b" class="outline-2">
-<h2 id="org293b43b">XMPP</h2>
-<div class="outline-text-2" id="text-org293b43b">
+<div id="outline-container-sec-44" class="outline-2">
+<h2 id="sec-44">XMPP</h2>
+<div class="outline-text-2" id="text-44">
 <p>
 Chat server which can be used together with client such as Gajim or Conversations to provide end-to-end content security and also onion routed metadata security. Includes advanced features such as <i>client state notification</i> to save battery power on your mobile devices, support for seamless roaming between networks and <i>message carbons</i> so that you can receive the same messages while being simultaneously logged in to your account on more than one device.
 </p>

website/EN/fediverse.html

@@ -3,33 +3,26 @@
 "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-02-21 Wed 14:52 -->
-<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="Homesteading the Fediverse"
+<title></title>
+<!-- 2018-03-10 Sat 20:00 -->
+<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="Homesteading the Fediverse"
  />
-<meta name="keywords" content="freedombone, homestead, fediverse" />
+<meta  name="keywords" content="freedombone, homestead, fediverse" />
 <style type="text/css">
  <!--/*--><![CDATA[/*><!--*/
-  .title  { text-align: center;
-             margin-bottom: .2em; }
-  .subtitle { text-align: center;
-              font-size: medium;
-              font-weight: bold;
-              margin-top:0; }
+  .title  { text-align: center; }
   .todo   { font-family: monospace; color: red; }
-  .done   { font-family: monospace; color: green; }
-  .priority { font-family: monospace; color: orange; }
+  .done   { color: green; }
   .tag    { background-color: #eee; font-family: monospace;
             padding: 2px; font-size: 80%; font-weight: normal; }
   .timestamp { color: #bebebe; }
   .timestamp-kwd { color: #5f9ea0; }
-  .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; }
+  .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; }
   .underline { text-decoration: underline; }
   #postamble p, #preamble p { font-size: 90%; margin: .2em; }
   p.verse { margin-left: 3%; }
@@ -56,111 +49,27 @@
     border: 1px solid black;
   }
   pre.src:hover:before { display: inline;}
-  /* 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-sh:before    { content: 'sh'; }
+  pre.src-bash:before  { content: 'sh'; }
   pre.src-emacs-lisp:before { content: 'Emacs Lisp'; }
-  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'; }
+  pre.src-R:before     { content: 'R'; }
+  pre.src-perl:before  { content: 'Perl'; }
+  pre.src-java:before  { content: 'Java'; }
+  pre.src-sql:before   { content: 'SQL'; }
 
   table { border-collapse:collapse; }
   caption.t-above { caption-side: top; }
   caption.t-bottom { caption-side: bottom; }
   td, th { vertical-align:top;  }
-  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; }
+  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; }
   dt { font-weight: bold; }
-  .footpara { display: inline; }
+  .footpara:nth-child(2) { display: inline; }
+  .footpara { display: block; }
   .footdef  { margin-bottom: 1em; }
   .figure { padding: 1em; }
   .figure p { text-align: center; }
@@ -180,7 +89,6 @@
     { 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" />
@@ -189,7 +97,7 @@
 @licstart  The following is the entire license notice for the
 JavaScript code in this tag.
 
-Copyright (C) 2012-2017 Free Software Foundation, Inc.
+Copyright (C) 2012-2013 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
@@ -236,7 +144,8 @@ for the JavaScript code in this tag.
 <a name="top" id="top"></a>
 </div>
 <div id="content">
-<div class="org-center">
+<h1 class="title"></h1>
+<div class="center">
 
 <div class="figure">
 <p><img src="images/logo.png" alt="logo.png" />
@@ -244,77 +153,83 @@ for the JavaScript code in this tag.
 </div>
 </div>
 
-<center>
-<h1>Homesteading the Fediverse</h1>
-</center>
+<div class="center">
+<p>
+<b>Homesteading the Fediverse</b>
+</p>
+</div>
 
 <p>
 Some things you might want to know about the Fediverse:
 </p>
 
-<div id="outline-container-org0e5c3f9" class="outline-2">
-<h2 id="org0e5c3f9">Federation as a concept</h2>
-<div class="outline-text-2" id="text-org0e5c3f9">
+<div id="outline-container-sec-1" class="outline-2">
+<h2 id="sec-1">Federation as a concept</h2>
+<div class="outline-text-2" id="text-1">
 <p>
-The political definition of a federation is "<i>a union of partially self-governing states or regions under a central (federal) government</i>". The fediverse isn't exactly like that, in that there is no federal government. However there are protocols which govern the communication between instances and that might be analogized to being a sort of elemantary constitution or mutual agreement binding all participants together. The protocols are merely ways of moving data around though, and don't impose any sort of moral code.
+The political definition of a federation is "<i>a union of partially self-governing states or regions under a central (federal) government</i>". The fediverse isn't exactly like that, in that there is no federal government. However there are protocols which govern the communication between instances and that might be analogized to being a sort of elementary constitution or mutual agreement binding all participants together. The protocols are merely ways of moving data around though, and don't impose any sort of moral code.
 </p>
 </div>
 </div>
-<div id="outline-container-org90385ba" class="outline-2">
-<h2 id="org90385ba">Keep the number of users on each server small</h2>
-<div class="outline-text-2" id="text-org90385ba">
+<div id="outline-container-sec-2" class="outline-2">
+<h2 id="sec-2">Keep the number of users on each server small</h2>
+<div class="outline-text-2" id="text-2">
 <p>
 The importance of this can't be overstated. Servers with lots of users always eventually have problems where the interests of the users are not the same as the interests of the server administrator. If you are the server administrator, or if there are only a small squad-size group of people on the server, then it's a lot easier to resolve differences and everyone's interests are likely to be similar.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org1f1a75f" class="outline-2">
-<h2 id="org1f1a75f">Drama will happen</h2>
-<div class="outline-text-2" id="text-org1f1a75f">
+<div id="outline-container-sec-3" class="outline-2">
+<h2 id="sec-3">Drama will happen</h2>
+<div class="outline-text-2" id="text-3">
 <p>
 It's inevitable in any social network, but fortunately your options for dealing with it are better than they are in the giant proprietary monoliths. In the proprietary world Google or Facebook don't give a damn about the fate of individual users. On a server with a small number of users if you're getting griefed then the administrator is likely to care and be able to do something about it.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org249f254" class="outline-2">
-<h2 id="org249f254">Don't be afraid to block</h2>
-<div class="outline-text-2" id="text-org249f254">
+<div id="outline-container-sec-4" class="outline-2">
+<h2 id="sec-4">Don't be afraid to block</h2>
+<div class="outline-text-2" id="text-4">
 <p>
 Especially if other servers are publishing content which may not be legal in your jurisdiction then don't be afraid to use domain or user blocking from the <b>Administrator control panel</b>. The same applies if users on other servers are trying to harass you. Blocking creates politics and drama but <span class="underline">this is a feature not a bug</span>. It allows you to craft your own distinct community and user experience while also existing in the wider federation. It's hard to do this on sites like Twitter or Facebook. Try to keep blocking to a minimum though and avoid doing it for insubstantial reasons. If you have other users on your server then publish the blocked domains list somewhere they can see. That avoids disappointment and enables you to have a discussion about the validity of blocking decisions.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org16e1345" class="outline-2">
-<h2 id="org16e1345">Network structure maps on to social structure</h2>
-<div class="outline-text-2" id="text-org16e1345">
+<div id="outline-container-sec-5" class="outline-2">
+<h2 id="sec-5">Network structure maps on to social structure</h2>
+<div class="outline-text-2" id="text-5">
 <p>
 Over time follows and blocking rules come to match the underlying social geography of affinity groups. Blocking will happen and users will move around or start new servers. Drama related to blocking will dissipate.
 </p>
 </div>
 </div>
 
-<div id="outline-container-orga5968b2" class="outline-2">
-<h2 id="orga5968b2">Keep your follows under the Dunbar number</h2>
-<div class="outline-text-2" id="text-orga5968b2">
+<div id="outline-container-sec-6" class="outline-2">
+<h2 id="sec-6">Keep your follows under the Dunbar number</h2>
+<div class="outline-text-2" id="text-6">
+<p>
+Keep the number of other frequently active users you're following to under a couple of hundred. Your actual number of follows might be larger than this but could include users who rarely post anything.
+</p>
+
 <p>
-Keep the number of other users you're following and who are also active to under a couple of hundred. Any more than that and you'll just be overwhelmed by irrelevant stuff and whatever community you may have been part of will dissolve in a sea of entropy. There are no algorithmic timelines, and even if they're introduced then they create their own problems as an opaque form of censorship. <span class="underline">Real community happens at tribal scale</span>. It's something which people often don't like to admit because they get fixated upon bigger and bigger numbers, but it definitely seems to be true.
+Once there are more than a couple of hundred highly active users in your timeline then you'll just be overwhelmed by irrelevant stuff and whatever community you may have been part of will be drowned in the entropy. There are no algorithmic timelines to hide posts, and even if they're introduced then they create their own problems as an opaque form of censorship. <span class="underline">Real community happens at tribal scale</span>. It's something which people often don't like to admit because they get fixated upon bigger and bigger numbers, but it definitely seems to be true.
 </p>
 </div>
 </div>
 
-<div id="outline-container-orgc8c8b40" class="outline-2">
-<h2 id="orgc8c8b40">Avoid big public servers</h2>
-<div class="outline-text-2" id="text-orgc8c8b40">
+<div id="outline-container-sec-7" class="outline-2">
+<h2 id="sec-7">Avoid big public servers</h2>
+<div class="outline-text-2" id="text-7">
 <p>
 It may seem like a good idea and it may seem like you're doing a service to the community by allowing random strangers to register, but servers with thousands of users only cause problems - social, administrative, financial and possibly also legal. The financial strain of running a powerful server with high reliability may be enough to encourage the administrator to begin pushing advertising onto the system, or sell user content, and then before you know it you have identical problems to Twitter. Instead try to encourage people to set up their own servers. Follow this principle and a lot of arguments and stress will be more easily avoided.
 </p>
 
 
 
-<div class="org-center">
+<div class="center">
 <p>
 This site can also be accessed via a Tor browser at <a href="http://yjxlc3imv7obva4grjae6u3qw527koaytrgjgdp364hmthrst3jodiid.onion">http://yjxlc3imv7obva4grjae6u3qw527koaytrgjgdp364hmthrst3jodiid.onion</a>. This documentation is under the <a href="https://www.gnu.org/licenses/fdl-1.3.txt">GNU Free Documentation License version 1.3</a>
 </p>

website/EN/index.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-02-04 Sun 21:09 -->
+<!-- 2018-03-13 Tue 12:38 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>&lrm;</title>
@@ -258,24 +258,17 @@ So you want to run your own internet services? Email, chat, VoIP, web sites, fil
 </p>
 
 <p>
-<a href="./homeserver.html">Here's how</a>.
+A list of other supported ARM boards <a href="./boards.html">can be found here</a>, or you can install onto an old laptop or netbook. Some installation instructions for different use cases are:
 </p>
 
-<p>
-And here's how <a href="./beaglebone.html">on a Beaglebone Black</a>. A list of other supported ARM boards <a href="./boards.html">can be found here</a>.
-</p>
-
-<p>
-Or you can install <a href="./debianinstall.html">onto an existing Debian system</a>.
-</p>
-
-<p>
-If you have a single board ARM computer which isn't one of the officially supported ones, such as Raspberry Pi, then you may still be able to install <a href="./armbian.html">Freedombone with Armbian</a>.
-</p>
-
-<p>
-Want to make a community mesh network which can either be fully autonomous or connected to the internet? The <a href="./mesh.html">Freedombone Mesh</a> is a wireless solution for networked communication that can be rapidly deployed in temporary, emergency or post-disaster situations where internet access is unavailable or compromised, or used as an infrastructural community service similar to <a href="https://en.wikipedia.org/wiki/Freifunk">Freifunk</a>.
-</p>
+<ul class="org-ul">
+<li><a href="./homeserver.html">Typical installation</a></li>
+<li>Installing <a href="./beaglebone.html">on a Beaglebone Black</a></li>
+<li>Installing on an <a href="./debianinstall.html">existing Debian system</a></li>
+<li>Installing <a href="./armbian.html">on Armbian</a>, for unsupported ARM boards such as Raspberry Pi</li>
+<li>Creating a dedicated <a href="./socialinstance.html">fediverse instance</a> for a single user or to host a community</li>
+<li>Deploying a <a href="./mesh.html">mesh network</a> which can operate with or without the internet</li>
+</ul>
 
 <p>
 After installation it's possible that you might want some advice on how to run your system and set up apps to work nicely with it.
@@ -283,13 +276,15 @@ After installation it's possible that you might want some advice on how to run y
 
 <ul class="org-ul">
 <li><a href="./domains.html">How to get a domain name</a></li>
+<li><a href="./security.html">Improving security</a></li>
+<li><a href="./users.html">Adding or removing users</a></li>
 <li><a href="./apps.html">Apps available on the system</a></li>
-<li><a href="./usage.html">General usage</a></li>
 <li><a href="./faq.html">Frequently Asked Questions</a></li>
 <li><a href="./mobile.html">Advice on setting up a mobile phone</a></li>
 <li><a href="./support.html">I like this project. How can I help to support it?</a></li>
 </ul>
 
+
 <p>
 If you find bugs, or want to add a new app to this system see the <a href="./devguide.html">Developers Guide</a> and <a href="./codeofconduct.html">Code of Conduct</a>. There is a Matrix chat room available at <b>#fbone:matrix.freedombone.net</b>.
 </p>

website/EN/security.html

@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"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-03-10 Sat 20:54 -->
+<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="Improving security"
+ />
+<meta  name="keywords" content="freedombone, security, ssh, debian, beaglebone" />
+<style type="text/css">
+ <!--/*--><![CDATA[/*><!--*/
+  .title  { text-align: center; }
+  .todo   { font-family: monospace; color: red; }
+  .done   { color: green; }
+  .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; }
+  .underline { text-decoration: underline; }
+  #postamble p, #preamble p { font-size: 90%; margin: .2em; }
+  p.verse { margin-left: 3%; }
+  pre {
+    border: 1px solid #ccc;
+    box-shadow: 3px 3px 3px #eee;
+    padding: 8pt;
+    font-family: monospace;
+    overflow: auto;
+    margin: 1.2em;
+  }
+  pre.src {
+    position: relative;
+    overflow: visible;
+    padding-top: 1.2em;
+  }
+  pre.src:before {
+    display: none;
+    position: absolute;
+    background-color: white;
+    top: -10px;
+    right: 10px;
+    padding: 3px;
+    border: 1px solid black;
+  }
+  pre.src:hover:before { display: inline;}
+  pre.src-sh:before    { content: 'sh'; }
+  pre.src-bash:before  { content: 'sh'; }
+  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'; }
+
+  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; }
+  dt { font-weight: bold; }
+  .footpara:nth-child(2) { display: inline; }
+  .footpara { display: block; }
+  .footdef  { margin-bottom: 1em; }
+  .figure { padding: 1em; }
+  .figure p { text-align: center; }
+  .inlinetask {
+    padding: 10px;
+    border: 2px solid gray;
+    margin: 10px;
+    background: #ffffcc;
+  }
+  #org-div-home-and-up
+   { text-align: right; font-size: 70%; white-space: nowrap; }
+  textarea { overflow-x: auto; }
+  .linenr { font-size: smaller }
+  .code-highlighted { background-color: #ffff00; }
+  .org-info-js_info-navigation { border-style: none; }
+  #org-info-js_console-label
+    { font-size: 10px; font-weight: bold; white-space: nowrap; }
+  .org-info-js_search-highlight
+    { background-color: #ffff00; color: #000000; font-weight: bold; }
+  /*]]>*/-->
+</style>
+<link rel="stylesheet" type="text/css" href="freedombone.css" />
+<script type="text/javascript">
+/*
+@licstart  The following is the entire license notice for the
+JavaScript code in this tag.
+
+Copyright (C) 2012-2013 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
+General Public License (GNU GPL) as published by the Free Software
+Foundation, either version 3 of the License, or (at your option)
+any later version.  The code is distributed WITHOUT ANY WARRANTY;
+without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
+
+As additional permission under GNU GPL version 3 section 7, you
+may distribute non-source (e.g., minimized or compacted) forms of
+that code without the copy of the GNU GPL normally required by
+section 4, provided you include this license notice and a URL
+through which recipients can access the Corresponding Source.
+
+
+@licend  The above is the entire license notice
+for the JavaScript code in this tag.
+*/
+<!--/*--><![CDATA[/*><!--*/
+ function CodeHighlightOn(elem, id)
+ {
+   var target = document.getElementById(id);
+   if(null != target) {
+     elem.cacheClassElem = elem.className;
+     elem.cacheClassTarget = target.className;
+     target.className = "code-highlighted";
+     elem.className   = "code-highlighted";
+   }
+ }
+ function CodeHighlightOff(elem, id)
+ {
+   var target = document.getElementById(id);
+   if(elem.cacheClassElem)
+     elem.className = elem.cacheClassElem;
+   if(elem.cacheClassTarget)
+     target.className = elem.cacheClassTarget;
+ }
+/*]]>*///-->
+</script>
+</head>
+<body>
+<div id="preamble" class="status">
+<a name="top" id="top"></a>
+</div>
+<div id="content">
+<h1 class="title"></h1>
+<div class="center">
+
+<div class="figure">
+<p><img src="images/logo.png" alt="logo.png" />
+</p>
+</div>
+</div>
+
+<div id="outline-container-sec-1" class="outline-2">
+<h2 id="sec-1">Authentication with keys</h2>
+<div class="outline-text-2" id="text-1">
+<p>
+It's a lot more secure to log in to the Freedombone system using ssh keys rather than with a password. You can set that up by first running:
+</p>
+
+<div class="org-src-container">
+
+<pre class="src src-bash">freedombone-client
+</pre>
+</div>
+
+<p>
+On your local system (i.e. whatever you're logging in to the Freedombone system from, typically a laptop). Then:
+</p>
+
+<pre class="example">
+ssh myusername@freedombone.local -p 2222
+</pre>
+
+<p>
+Select <b>Administrator controls</b> and re-enter your password, then <b>Manage Users</b> and <b>Change user ssh public key</b>. Copy and paste the ssh public keys which appeared after the <b>freedombone-client</b> command was run. Then go to <b>Security settings</b> and select <b>Allow ssh login with passwords</b> followed by <b>no</b>.
+</p>
+
+<p>
+You'll need to make sure that you have a copy of the ~/.ssh directory on your local system. You could just copy that directory to a USB drive and then keep that somewhere safe so that you can restore the keys if you need to.
+</p>
+</div>
+</div>
+<div id="outline-container-sec-2" class="outline-2">
+<h2 id="sec-2">Administrating the system via an onion address (Tor)</h2>
+<div class="outline-text-2" id="text-2">
+<p>
+You can also access your system via the Tor system using an onion address. To find out what the onion address for ssh access is you can do the following:
+</p>
+
+<div class="org-src-container">
+
+<pre class="src src-bash">ssh username@freedombone.local -p 2222
+</pre>
+</div>
+
+<p>
+Select <i>Administrator controls</i> then select "About this system" and look for the onion address for ssh. You can then close the terminal and open another, then do the following on your local system:
+</p>
+
+<div class="org-src-container">
+
+<pre class="src src-bash">freedombone-client
+</pre>
+</div>
+
+<p>
+This will set up your ssh environment to be able to handle onion addresses. Then you can test ssh with:
+</p>
+
+<div class="org-src-container">
+
+<pre class="src src-bash">ssh username@address.onion -p 2222
+</pre>
+</div>
+
+<p>
+Subsequently even if dynamic DNS isn't working you may still be able to administer your system. Using the onion address also gives you some degree of protection against corporate or government metadata analysis, since it becomes more difficult to passively detect which systems are communicating.
+</p>
+</div>
+</div>
+</div>
+<div id="postamble" class="status">
+
+<style type="text/css">
+.back-to-top {
+    position: fixed;
+    bottom: 2em;
+    right: 0px;
+    text-decoration: none;
+    color: #000000;
+    background-color: rgba(235, 235, 235, 0.80);
+    font-size: 12px;
+    padding: 1em;
+    display: none;
+}
+
+.back-to-top:hover {
+    background-color: rgba(135, 135, 135, 0.50);
+}
+</style>
+
+<div class="back-to-top">
+<a href="#top">Back to top</a> | <a href="mailto:bob@freedombone.net">E-mail me</a>
+</div>
+</div>
+</body>
+</html>

website/EN/socialinstance.html

@@ -0,0 +1,419 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"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-03-13 Tue 12:58 -->
+<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="Social Instance"
+ />
+<meta name="keywords" content="freedombone, debian, social, fediverse, instance, pleroma, gnusocial, postactiv" />
+<style type="text/css">
+ <!--/*--><![CDATA[/*><!--*/
+  .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   { 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; }
+  .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%; }
+  pre {
+    border: 1px solid #ccc;
+    box-shadow: 3px 3px 3px #eee;
+    padding: 8pt;
+    font-family: monospace;
+    overflow: auto;
+    margin: 1.2em;
+  }
+  pre.src {
+    position: relative;
+    overflow: visible;
+    padding-top: 1.2em;
+  }
+  pre.src:before {
+    display: none;
+    position: absolute;
+    background-color: white;
+    top: -10px;
+    right: 10px;
+    padding: 3px;
+    border: 1px solid black;
+  }
+  pre.src:hover:before { display: inline;}
+  /* 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-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.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 { display: inline; }
+  .footdef  { margin-bottom: 1em; }
+  .figure { padding: 1em; }
+  .figure p { text-align: center; }
+  .inlinetask {
+    padding: 10px;
+    border: 2px solid gray;
+    margin: 10px;
+    background: #ffffcc;
+  }
+  #org-div-home-and-up
+   { text-align: right; font-size: 70%; white-space: nowrap; }
+  textarea { overflow-x: auto; }
+  .linenr { font-size: smaller }
+  .code-highlighted { background-color: #ffff00; }
+  .org-info-js_info-navigation { border-style: none; }
+  #org-info-js_console-label
+    { 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" />
+<script type="text/javascript">
+/*
+@licstart  The following is the entire license notice for the
+JavaScript code in this tag.
+
+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
+General Public License (GNU GPL) as published by the Free Software
+Foundation, either version 3 of the License, or (at your option)
+any later version.  The code is distributed WITHOUT ANY WARRANTY;
+without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
+
+As additional permission under GNU GPL version 3 section 7, you
+may distribute non-source (e.g., minimized or compacted) forms of
+that code without the copy of the GNU GPL normally required by
+section 4, provided you include this license notice and a URL
+through which recipients can access the Corresponding Source.
+
+
+@licend  The above is the entire license notice
+for the JavaScript code in this tag.
+*/
+<!--/*--><![CDATA[/*><!--*/
+ function CodeHighlightOn(elem, id)
+ {
+   var target = document.getElementById(id);
+   if(null != target) {
+     elem.cacheClassElem = elem.className;
+     elem.cacheClassTarget = target.className;
+     target.className = "code-highlighted";
+     elem.className   = "code-highlighted";
+   }
+ }
+ function CodeHighlightOff(elem, id)
+ {
+   var target = document.getElementById(id);
+   if(elem.cacheClassElem)
+     elem.className = elem.cacheClassElem;
+   if(elem.cacheClassTarget)
+     target.className = elem.cacheClassTarget;
+ }
+/*]]>*///-->
+</script>
+</head>
+<body>
+<div id="preamble" class="status">
+<a name="top" id="top"></a>
+</div>
+<div id="content">
+<div class="org-center">
+
+<div class="figure">
+<p><img src="images/logo.png" alt="logo.png" />
+</p>
+</div>
+</div>
+
+<center>
+<h1>Social Instance</h1>
+</center>
+
+<p>
+A social instance image allows you to easily set up a fediverse server, which federates using the OStatus or ActivityPub protocol. You will need:
+</p>
+
+<ul class="org-ul">
+<li>An old laptop, capable of booting from USB</li>
+<li>A USB drive, preferably Sandisk and 16GB or larger</li>
+<li>An ethernet patch cable</li>
+<li>A domain name of your own</li>
+<li>A dynamic DNS account</li>
+</ul>
+
+<p>
+The installation process is the same as usual, with the only difference being that on initial setup it will go straight to the domain setup details for your instance. In summary:
+</p>
+
+<div id="outline-container-orga9aa61d" class="outline-2">
+<h2 id="orga9aa61d">Copy the image to the USB drive</h2>
+<div class="outline-text-2" id="text-orga9aa61d">
+<p>
+Substitute <b>sdX</b> with the device name for your USB drive.
+</p>
+
+<div class="org-src-container">
+<pre class="src src-bash">sudo apt-get install xz-utils wget
+wget https://freedombone.net/downloads/current/freedombone-pleroma-amd64.img.xz
+wget https://freedombone.net/downloads/current/freedombone-pleroma-amd64.img.xz.sig
+gpg --verify freedombone-pleroma-amd64.img.xz.sig
+unxz freedombone-pleroma-amd64.img.xz
+sudo dd <span class="org-variable-name">if</span>=/dev/zero <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">count</span>=8
+sudo dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">if</span>=freedombone-pleroma-amd64.img <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">conv</span>=fdatasync
+</pre>
+</div>
+
+<p>
+Also note that if the laptop has a removable SSD drive it's possible to copy the image directly to that if you have enough equipment.
+</p>
+</div>
+</div>
+
+<div id="outline-container-org4454ad3" class="outline-2">
+<h2 id="org4454ad3">Connect the laptop to your internet router</h2>
+<div class="outline-text-2" id="text-org4454ad3">
+<p>
+Plug the USB drive into the laptop and connect it to your internet router with the ethernet cable.
+</p>
+
+<div class="org-center">
+
+<div class="figure">
+<p><img src="images/laptop_router.jpg" alt="laptop_router.jpg" />
+</p>
+</div>
+</div>
+</div>
+</div>
+
+<div id="outline-container-orgd646ced" class="outline-2">
+<h2 id="orgd646ced">Boot the laptop from the USB drive</h2>
+<div class="outline-text-2" id="text-orgd646ced">
+<p>
+You may need to alter the BIOS settings to get this to work reliably.
+</p>
+
+<div class="org-center">
+
+<div class="figure">
+<p><img src="images/bios_boot_usb.jpg" alt="bios_boot_usb.jpg" />
+</p>
+</div>
+</div>
+</div>
+</div>
+
+<div id="outline-container-orgfc4d060" class="outline-2">
+<h2 id="orgfc4d060">Forward ports 80 (HTTP) and 443 (HTTPS) from your internet router to the laptop</h2>
+<div class="outline-text-2" id="text-orgfc4d060">
+<p>
+Log into your internet router using a non-Tor browser (usually it's on an address like 192.168.1.1 or 192.168.1.254). Often port forwarding settings are together with firewall settings.
+</p>
+
+<div class="org-center">
+
+<div class="figure">
+<p><img src="images/port_forwarding.png" alt="port_forwarding.png" />
+</p>
+</div>
+</div>
+</div>
+</div>
+
+<div id="outline-container-org1de31c9" class="outline-2">
+<h2 id="org1de31c9">From another machine ssh into the laptop</h2>
+<div class="outline-text-2" id="text-org1de31c9">
+<div class="org-src-container">
+<pre class="src src-bash">ssh fbone@freedombone.local -p 2222
+</pre>
+</div>
+
+<p>
+Or alternatively you can log in directly on the laptop. The initial username is <b>fbone</b> and the password is <b>freedombone</b>. You should make sure you write down or copy the new password when it is shown.
+</p>
+</div>
+</div>
+
+<div id="outline-container-org73f6c40" class="outline-2">
+<h2 id="org73f6c40">Follow the setup procedure</h2>
+<div class="outline-text-2" id="text-org73f6c40">
+<p>
+Enter your user details, domain name and dynamic DNS settings.
+</p>
+</div>
+</div>
+
+<div id="outline-container-org0c76d5c" class="outline-2">
+<h2 id="org0c76d5c">When installation is complete</h2>
+<div class="outline-text-2" id="text-org0c76d5c">
+<p>
+Navigate to your domain and register a new user.
+</p>
+
+<div class="org-center">
+
+<div class="figure">
+<p><img src="images/pleroma_register.jpg" alt="pleroma_register.jpg" />
+</p>
+</div>
+</div>
+
+<p>
+More details about setting up and using Pleroma <a href="./app_pleroma.html">can be found here</a>.
+</p>
+
+<div class="org-center">
+
+<div class="figure">
+<p><img src="images/tusky.jpg" alt="tusky.jpg" />
+</p>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div id="postamble" class="status">
+
+<style type="text/css">
+.back-to-top {
+    position: fixed;
+    bottom: 2em;
+    right: 0px;
+    text-decoration: none;
+    color: #000000;
+    background-color: rgba(235, 235, 235, 0.80);
+    font-size: 12px;
+    padding: 1em;
+    display: none;
+}
+
+.back-to-top:hover {
+    background-color: rgba(135, 135, 135, 0.50);
+}
+</style>
+
+<div class="back-to-top">
+<a href="#top">Back to top</a> | <a href="mailto:bob@freedombone.net">E-mail me</a>
+</div>
+</div>
+</body>
+</html>

website/EN/users.html

@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"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-03-10 Sat 20:58 -->
+<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="Adding or removing users"
+ />
+<meta  name="keywords" content="freedombone, debian, beaglebone, users" />
+<style type="text/css">
+ <!--/*--><![CDATA[/*><!--*/
+  .title  { text-align: center; }
+  .todo   { font-family: monospace; color: red; }
+  .done   { color: green; }
+  .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; }
+  .underline { text-decoration: underline; }
+  #postamble p, #preamble p { font-size: 90%; margin: .2em; }
+  p.verse { margin-left: 3%; }
+  pre {
+    border: 1px solid #ccc;
+    box-shadow: 3px 3px 3px #eee;
+    padding: 8pt;
+    font-family: monospace;
+    overflow: auto;
+    margin: 1.2em;
+  }
+  pre.src {
+    position: relative;
+    overflow: visible;
+    padding-top: 1.2em;
+  }
+  pre.src:before {
+    display: none;
+    position: absolute;
+    background-color: white;
+    top: -10px;
+    right: 10px;
+    padding: 3px;
+    border: 1px solid black;
+  }
+  pre.src:hover:before { display: inline;}
+  pre.src-sh:before    { content: 'sh'; }
+  pre.src-bash:before  { content: 'sh'; }
+  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'; }
+
+  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; }
+  dt { font-weight: bold; }
+  .footpara:nth-child(2) { display: inline; }
+  .footpara { display: block; }
+  .footdef  { margin-bottom: 1em; }
+  .figure { padding: 1em; }
+  .figure p { text-align: center; }
+  .inlinetask {
+    padding: 10px;
+    border: 2px solid gray;
+    margin: 10px;
+    background: #ffffcc;
+  }
+  #org-div-home-and-up
+   { text-align: right; font-size: 70%; white-space: nowrap; }
+  textarea { overflow-x: auto; }
+  .linenr { font-size: smaller }
+  .code-highlighted { background-color: #ffff00; }
+  .org-info-js_info-navigation { border-style: none; }
+  #org-info-js_console-label
+    { font-size: 10px; font-weight: bold; white-space: nowrap; }
+  .org-info-js_search-highlight
+    { background-color: #ffff00; color: #000000; font-weight: bold; }
+  /*]]>*/-->
+</style>
+<link rel="stylesheet" type="text/css" href="freedombone.css" />
+<script type="text/javascript">
+/*
+@licstart  The following is the entire license notice for the
+JavaScript code in this tag.
+
+Copyright (C) 2012-2013 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
+General Public License (GNU GPL) as published by the Free Software
+Foundation, either version 3 of the License, or (at your option)
+any later version.  The code is distributed WITHOUT ANY WARRANTY;
+without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
+
+As additional permission under GNU GPL version 3 section 7, you
+may distribute non-source (e.g., minimized or compacted) forms of
+that code without the copy of the GNU GPL normally required by
+section 4, provided you include this license notice and a URL
+through which recipients can access the Corresponding Source.
+
+
+@licend  The above is the entire license notice
+for the JavaScript code in this tag.
+*/
+<!--/*--><![CDATA[/*><!--*/
+ function CodeHighlightOn(elem, id)
+ {
+   var target = document.getElementById(id);
+   if(null != target) {
+     elem.cacheClassElem = elem.className;
+     elem.cacheClassTarget = target.className;
+     target.className = "code-highlighted";
+     elem.className   = "code-highlighted";
+   }
+ }
+ function CodeHighlightOff(elem, id)
+ {
+   var target = document.getElementById(id);
+   if(elem.cacheClassElem)
+     elem.className = elem.cacheClassElem;
+   if(elem.cacheClassTarget)
+     target.className = elem.cacheClassTarget;
+ }
+/*]]>*///-->
+</script>
+</head>
+<body>
+<div id="preamble" class="status">
+<a name="top" id="top"></a>
+</div>
+<div id="content">
+<h1 class="title"></h1>
+<div class="center">
+
+<div class="figure">
+<p><img src="images/logo.png" alt="logo.png" />
+</p>
+</div>
+</div>
+
+<p>
+Log into the system with:
+</p>
+
+<div class="org-src-container">
+
+<pre class="src src-bash">ssh username@domainname -p 2222
+</pre>
+</div>
+
+<p>
+Select <b>Administrator controls</b> then <b>User Management</b>.
+</p>
+
+
+<div class="figure">
+<p><img src="images/controlpanel/control_panel_manage_users.jpg" alt="control_panel_manage_users.jpg" />
+</p>
+</div>
+</div>
+<div id="postamble" class="status">
+
+<style type="text/css">
+.back-to-top {
+    position: fixed;
+    bottom: 2em;
+    right: 0px;
+    text-decoration: none;
+    color: #000000;
+    background-color: rgba(235, 235, 235, 0.80);
+    font-size: 12px;
+    padding: 1em;
+    display: none;
+}
+
+.back-to-top:hover {
+    background-color: rgba(135, 135, 135, 0.50);
+}
+</style>
+
+<div class="back-to-top">
+<a href="#top">Back to top</a> | <a href="mailto:bob@freedombone.net">E-mail me</a>
+</div>
+</div>
+</body>
+</html>