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

doc/EN/app_bdsmail.org

@@ -0,0 +1,33 @@
+#+TITLE:
+#+AUTHOR: Bob Mottram
+#+EMAIL: bob@freedombone.net
+#+KEYWORDS: freedombone, dlna
+#+DESCRIPTION: How to use BDS Mail
+#+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>BDS Mail</h1>
+</center>
+#+END_EXPORT
+
+BDS Mail (aka "Brain Dead Simple Mail") is an optional addition to the existing email server which comes installed as default. It creates an extra folder within the Mutt client which allows you to send and receive email using [[https://en.wikipedia.org/wiki/I2P][i2p]] as the transport layer. This solves the problem of being blocked by dubious systems and also the problem of user friendly email encryption. If you're behind a hostile firewall which you don't control and which blocks all ports, this system is still likely to work. You can use GPG as an additional encryption layer if you prefer, but it's not strictly necessary because you already have the i2p public key system to ensure end-to-end security.
+
+It's unlikely that many people will use this. If it's hard to persuade anyone to use GPG or Enigmail then it will be /next to impossible/ to persuade them to switch to BDS Mail unless they're already obsessive about technical security. However, this provides yet another option for reasonably secure communications if other methods fail or are untrustable.
+
+* Installation
+
+ssh into the system with:
+
+#+BEGIN_SRC bash
+ssh myusername@mydomain.com -p 2222
+#+END_SRC
+
+Select *Administrator controls* then *App Settings* then *bdsmail*. It may take a while to install, due to the creation of keys.
+
+After installation if you exit from *Administrator controls* back to the user control panel then select the option to show your email address. You will now have a new bdsmail address which ends with /.b32.i2p/. If you then select *Use Email* to run the Mutt email client you'll notice that you now have a folder called *i2p*. If you select that folder (move up and down with /CTRL+n/ or /CTRL+p/ and open with /CTRL+o/) you can then send email from your new address, or receive mail to it. Just like ordinary email, but with a more random-looking address.

doc/EN/apps.org

@@ -29,6 +29,10 @@ The base install of the system just contains an email server and Mutt client, bu
 A web based accounts system for small businesses or freelancers.
 
 [[./app_akaunting.html][How to use it]]
+* BDS Mail
+It's like ordinary email, but with [[https://en.wikipedia.org/wiki/I2P][i2p]] as the transport mechanism.
+
+[[./app_bdsmail.html][How to use it]]
 * CryptPad
 Collaborate on editing documents, presentations and source code, or vote on things. All with a good level of security.
 

src/freedombone-app-bdsmail

@@ -34,10 +34,12 @@ IN_DEFAULT_INSTALL=0
 SHOW_ON_ABOUT=1
 
 BDSMAIL_REPO="https://github.com/majestrate/bdsmail"
-BDSMAIL_COMMIT='8fb00a725edea59b31b8d23eb32e0c21972bb723'
+BDSMAIL_COMMIT='6fae61365306ad3c1966a107aa06310ea65fb239'
 BDSMAIL_DIR=/etc/bdsmail
 I2P_SAM_PORT=7656
 I2P_SMTP_PORT=2525
+I2P_WEB_PORT=8489
+I2P_POP3_PORT=1110
 
 bdsmail=(MY_USERNAME)
 
@@ -95,9 +97,13 @@ function add_user_bdsmail {
         mkdir /home/$new_username/.mutt
         cp /etc/skel/.mutt/bdsmail /home/$new_username/.mutt
     fi
+    read_config_param MY_USERNAME
+    BDSMAIL_PASSWORD=$(${PROJECT_NAME}-pass -u $MY_USERNAME -a bdsmail)
     sed -i "s|username|$new_username|g" /home/$new_username/.mutt/bdsmail
+    sed -i "s|password|$BDSMAIL_PASSWORD|g" /home/$new_username/.mutt/bdsmail
     bdsmail_configure_users
-    $BDSMAIL_DIR/bin/mailtool $BDSMAIL_DIR/config.ini $new_username /home/$new_username/Maildir/i2p
+    cd $BDSMAIL_DIR
+    $BDSMAIL_DIR/bin/mailtool $BDSMAIL_DIR/config.ini $new_username /home/$new_username/Maildir/i2p "$BDSMAIL_PASSWORD"
     chown -R $new_username:$new_username /home/$new_username/.mutt
     echo '0'
 }
@@ -110,6 +116,19 @@ function install_interactive_bdsmail {
 function change_password_bdsmail {
     curr_username="$1"
     new_user_password="$2"
+
+    ${PROJECT_NAME}-pass -u $MY_USERNAME -a bdsmail -p "$new_user_password"
+
+    for d in /home/*/ ; do
+        USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
+            sed -i "s|set smtp_url=.*|set smtp_url=smtp://${curr_username}:${new_user_password}@127.0.0.1:$I2P_SMTP_PORT/" /home/${USERNAME}/.mutt/bdsmail
+            sed -i "s|set from=.*|set from=${USERNAME}@$(bdsmail_domain)|g" /home/${USERNAME}/.mutt/bdsmail
+            chown ${USERNAME}:${USERNAME} /home/${USERNAME}/.mutt/bdsmail
+            cd $BDSMAIL_DIR
+            $BDSMAIL_DIR/bin/mailtool $BDSMAIL_DIR/config.ini $curr_username /home/$curr_username/Maildir/i2p "$new_user_password"
+        fi
+    done
 }
 
 function bdsmail_update_domain {
@@ -333,8 +352,8 @@ function install_bdsmail {
     echo "i2paddr = 127.0.0.1:$I2P_SAM_PORT" >> $BDSMAIL_DIR/config.ini
     echo 'i2pkeyfile = bdsmail-privkey.dat' >> $BDSMAIL_DIR/config.ini
     echo "bindmail = 127.0.0.1:$I2P_SMTP_PORT" >> $BDSMAIL_DIR/config.ini
-    echo 'bindweb = 127.0.0.1:8489' >> $BDSMAIL_DIR/config.ini
-    echo 'bindpop3 = 127.0.0.1:1110' >> $BDSMAIL_DIR/config.ini
+    echo "bindweb = 127.0.0.1:$I2P_WEB_PORT" >> $BDSMAIL_DIR/config.ini
+    echo "bindpop3 = 127.0.0.1:$I2P_POP3_PORT" >> $BDSMAIL_DIR/config.ini
     echo 'domain = localhost' >> $BDSMAIL_DIR/config.ini
     echo 'maildir = Maildir/i2p' >> $BDSMAIL_DIR/config.ini
     echo 'database = localhost.sqlite' >> $BDSMAIL_DIR/config.ini
@@ -411,16 +430,17 @@ function install_bdsmail {
         exit 8934638
     fi
 
-    bdsmail_admin_password="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
-    ${PROJECT_NAME}-pass -u $MY_USERNAME -a bdsmail -p "$bdsmail_admin_password"
-    $BDSMAIL_DIR/bin/mailtool $BDSMAIL_DIR/config.ini admin $BDSMAIL_DIR/Maildir/i2p/admin "$bdsmail_admin_password"
+    BDSMAIL_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
+    ${PROJECT_NAME}-pass -u $MY_USERNAME -a bdsmail -p "$BDSMAIL_PASSWORD"
+    cd $BDSMAIL_DIR
+    $BDSMAIL_DIR/bin/mailtool $BDSMAIL_DIR/config.ini admin $BDSMAIL_DIR/Maildir/i2p/admin "$BDSMAIL_PASSWORD"
 
     # Create mutt configuration
     if [ ! -d /etc/skel/.mutt ]; then
         mkdir /etc/skel/.mutt
     fi
     echo 'set mbox_type=Maildir' > /etc/skel/.mutt/bdsmail
-    echo "set smtp_url=smtp://admin:${bdsmail_admin_password}@127.0.0.1:$I2P_SMTP_PORT/" >> /etc/skel/.mutt/bdsmail
+    echo "set smtp_url=smtp://username:password@127.0.0.1:$I2P_SMTP_PORT/" >> /etc/skel/.mutt/bdsmail
     echo 'set use_from=yes' >> /etc/skel/.mutt/bdsmail
     echo "set from=username@${bds_domain}" >> /etc/skel/.mutt/bdsmail
     echo "set spoolfile=~/Maildir/i2p" >> /etc/skel/.mutt/bdsmail
@@ -435,11 +455,13 @@ function install_bdsmail {
     fi
     cp /etc/skel/.mutt/bdsmail /home/$MY_USERNAME/.mutt
     sed -i "s|username|$MY_USERNAME|g" /home/$MY_USERNAME/.mutt/bdsmail
+    sed -i "s|password|$BDSMAIL_PASSWORD|g" /home/$MY_USERNAME/.mutt/bdsmail
     chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.mutt
 
     bdsmail_configure_users
 
-    $BDSMAIL_DIR/bin/mailtool $BDSMAIL_DIR/config.ini $MY_USERNAME /home/$MY_USERNAME/Maildir/i2p
+    cd $BDSMAIL_DIR
+    $BDSMAIL_DIR/bin/mailtool $BDSMAIL_DIR/config.ini $MY_USERNAME /home/$MY_USERNAME/Maildir/i2p "$BDSMAIL_PASSWORD"
 
     APP_INSTALLED=1
 }

src/freedombone-app-pleroma

@@ -93,19 +93,22 @@ function create_pleroma_blocklist {
     echo 'while read blocked; do' >> $blocking_script_file
     echo '    if [[ "$blocked" == *"."* || "$blocked" == *"@"* ]]; then' >> $blocking_script_file
     echo '        if [ ${#blocked} -gt 4 ]; then' >> $blocking_script_file
-    echo '          if [ $objects_updated ]; then' >> $blocking_script_file
-    echo '              objects_query="${objects_query} or"' >> $blocking_script_file
-    echo '              users_query="${users_query} or"' >> $blocking_script_file
-    echo '          fi' >> $blocking_script_file
-    echo "          objects_query=\"\${objects_query} data->>'content' ilike '%\${blocked}%' or data->>'actor' ilike '%\${blocked}%' or data->>'to' ilike '%\${blocked}%' or data->>'id' ilike '%\${blocked}%' or data->>'external_url' ilike '%\${blocked}%'\"" >> $blocking_script_file
-    echo "          users_query=\"\${users_query} nickname ilike '%\${blocked}%'\"" >> $blocking_script_file
-    echo '          objects_updated=1' >> $blocking_script_file
+    echo '            if [ $objects_updated ]; then' >> $blocking_script_file
+    echo '                objects_query="${objects_query} or"' >> $blocking_script_file
+    echo '                users_query="${users_query} or"' >> $blocking_script_file
+    echo '            fi' >> $blocking_script_file
+    echo "            objects_query=\"\${objects_query} data->>'content' ilike '%\${blocked}%' or data->>'actor' ilike '%\${blocked}%' or data->>'to' ilike '%\${blocked}%' or data->>'id' ilike '%\${blocked}%' or data->>'external_url' ilike '%\${blocked}%'\"" >> $blocking_script_file
+    echo "            users_query=\"\${users_query} nickname ilike '%\${blocked}%'\"" >> $blocking_script_file
+    echo '            objects_updated=1' >> $blocking_script_file
     echo '            if [[ "$blocked" != *"@"* ]]; then' >> $blocking_script_file
-    echo '              if [ $websub_server_subscriptions_updated ]; then' >> $blocking_script_file
-    echo '                  websub_server_subscriptions_query="${websub_server_subscriptions_query} or"' >> $blocking_script_file
-    echo '              fi' >> $blocking_script_file
-    echo "              websub_server_subscriptions_query=\"\${websub_server_subscriptions_query} callback like '%\${blocked}%'\"" >> $blocking_script_file
-    echo '              websub_server_subscriptions_updated=1' >> $blocking_script_file
+    echo '                if ! grep -q "127.0.0.1  $blocked" /etc/hosts; then' >> $blocking_script_file
+    echo '                    echo "127.0.0.1  $blocked" >> /etc/hosts' >> $blocking_script_file
+    echo '                fi' >> $blocking_script_file
+    echo '                if [ $websub_server_subscriptions_updated ]; then' >> $blocking_script_file
+    echo '                    websub_server_subscriptions_query="${websub_server_subscriptions_query} or"' >> $blocking_script_file
+    echo '                fi' >> $blocking_script_file
+    echo "                websub_server_subscriptions_query=\"\${websub_server_subscriptions_query} callback like '%\${blocked}%'\"" >> $blocking_script_file
+    echo '                websub_server_subscriptions_updated=1' >> $blocking_script_file
     echo '            fi' >> $blocking_script_file
     echo '        fi' >> $blocking_script_file
     echo '    fi' >> $blocking_script_file

src/freedombone-controlpanel-user

@@ -885,14 +885,15 @@ function menu_run_client_app {
 function show_your_email_address {
     GPG_FINGERPRINT=$(gpg --fingerprint $GPG_ID | sed -n '2p' | sed 's/^[ \t]*//')
     GPG_DATE=$(gpg --fingerprint $GPG_ID | grep -i "pub" | head -n 1 | awk -F ' ' '{print $3}')
-    if [ ! -d /etc/bdsmail ]; then
+    if [ ! -f ~/.mutt/bdsmail ]; then
         dialog --title $"Show your Email Address" \
                --backtitle $"Freedombone User Control Panel" \
                --msgbox $"Email Address: $MY_EMAIL_ADDRESS\n\nKey ID: $GPG_ID\n\nFingerprint: $GPG_FINGERPRINT\n\nCreated: $GPG_DATE" 12 70
     else
+        bdsmail_address=$(cat ~/.mutt/bdsmail | grep 'set from=' | awk -F '=' '{print $2}')
         dialog --title $"Show your Email Address" \
                --backtitle $"Freedombone User Control Panel" \
-               --msgbox $"\nYou can press SHIFT and then drag the mouse and right click to copy.\n\nEmail Address: $MY_EMAIL_ADDRESS\n\nKey ID: $GPG_ID\n\nFingerprint: $GPG_FINGERPRINT\n\nCreated: $GPG_DATE\n\nI2P Address: ${USER}@$(bdsmail_domain)" 17 90
+               --msgbox $"\nYou can press SHIFT and then drag the mouse and right click to copy.\n\nEmail Address: $MY_EMAIL_ADDRESS\n\nKey ID: $GPG_ID\n\nFingerprint: $GPG_FINGERPRINT\n\nCreated: $GPG_DATE\n\nI2P Address: ${bdsmail_address}" 17 90
     fi
 }
 

src/freedombone-utils-i2p

@@ -63,6 +63,7 @@ function install_i2p {
 }
 
 function remove_i2p {
+    service i2p stop
     apt-get -yq remove i2p-router --purge
     apt-get -yq remove i2p --purge
     apt-get -yq remove i2p-keyring --purge
@@ -82,15 +83,35 @@ function remove_i2p {
     if [ -d /usr/share/i2p ]; then
         rm -rf /usr/share/i2p
     fi
+    if [ -d /var/log/i2p ]; then
+        rm /var/log/i2p
+    fi
+    rm -rf /tmp/i2p*
 }
 
 function i2p_enable_sam {
     if [ ! -f /var/lib/i2p/i2p-config/clients.config ]; then
-        apt-get -yq remove i2p --purge
+        service i2p stop
+
+        apt-get -yq remove i2p i2p-keyring --purge
         apt-get -yq remove i2p-router --purge
-        apt-get -yq install i2p
-        apt-get -yq install i2p-router
-        sleep 2
+        if [ -d /var/lib/i2p ]; then
+            rm -rf /var/lib/i2p
+        fi
+        if [ -d /etc/i2p ]; then
+            rm -rf /etc/i2p
+        fi
+        if [ -d /usr/share/i2p ]; then
+            rm -rf /usr/share/i2p
+        fi
+        if [ -d /var/log/i2p ]; then
+            rm /var/log/i2p
+        fi
+        rm -rf /tmp/i2p*
+        apt-get -yq install i2p i2p-keyring
+        apt-get -yq install i2p-router --reinstall
+        systemctl restart i2p
+        sleep 10
     fi
     if [ ! -f /var/lib/i2p/i2p-config/clients.config ]; then
         echo $'File not found /var/lib/i2p/i2p-config/clients.config'

website/EN/app_bdsmail.html

@@ -0,0 +1,306 @@
+<?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-02-16 Fri 10:42 -->
+<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="How to use BDS Mail"
+ />
+<meta name="keywords" content="freedombone, dlna" />
+<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>BDS Mail</h1>
+</center>
+
+<p>
+BDS Mail (aka "Brain Dead Simple Mail") is an optional addition to the existing email server which comes installed as default. It creates an extra folder within the Mutt client which allows you to send and receive email using <a href="https://en.wikipedia.org/wiki/I2P">i2p</a> as the transport layer. This solves the problem of being blocked by dubious systems and also the problem of user friendly email encryption. If you're behind a hostile firewall which you don't control and which blocks all ports, this system is still likely to work. You can use GPG as an additional encryption layer if you prefer, but it's not strictly necessary because you already have the i2p public key system to ensure end-to-end security.
+</p>
+
+<p>
+It's unlikely that many people will use this. If it's hard to persuade anyone to use GPG or Enigmail then it will be <i>next to impossible</i> to persuade them to switch to BDS Mail unless they're already obsessive about technical security. However, this provides yet another option for reasonably secure communications if other methods fail or are untrustable.
+</p>
+
+<div id="outline-container-org4d1584a" class="outline-2">
+<h2 id="org4d1584a">Installation</h2>
+<div class="outline-text-2" id="text-org4d1584a">
+<p>
+ssh into the system with:
+</p>
+
+<div class="org-src-container">
+<pre class="src src-bash">ssh myusername@mydomain.com -p 2222
+</pre>
+</div>
+
+<p>
+Select <b>Administrator controls</b> then <b>App Settings</b> then <b>bdsmail</b>. It may take a while to install, due to the creation of keys.
+</p>
+
+<p>
+After installation if you exit from <b>Administrator controls</b> back to the user control panel then select the option to show your email address. You will now have a new bdsmail address which ends with <i>.b32.i2p</i>. If you then select <b>Use Email</b> to run the Mutt email client you'll notice that you now have a folder called <b>i2p</b>. If you select that folder (move up and down with <i>CTRL+n</i> or <i>CTRL+p</i> and open with <i>CTRL+o</i>) you can then send email from your new address, or receive mail to it. Just like ordinary email, but with a more random-looking address.
+</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/apps.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-02 Fri 14:51 -->
+<!-- 2018-02-16 Fri 10:42 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>&lrm;</title>
@@ -265,9 +265,9 @@ The base install of the system just contains an email server and Mutt client, bu
 </div>
 
 
-<div id="outline-container-org6873154" class="outline-2">
-<h2 id="org6873154">Akaunting</h2>
-<div class="outline-text-2" id="text-org6873154">
+<div id="outline-container-org1bb8cc9" class="outline-2">
+<h2 id="org1bb8cc9">Akaunting</h2>
+<div class="outline-text-2" id="text-org1bb8cc9">
 <p>
 A web based accounts system for small businesses or freelancers.
 </p>
@@ -277,9 +277,21 @@ A web based accounts system for small businesses or freelancers.
 </p>
 </div>
 </div>
-<div id="outline-container-org7e6ef98" class="outline-2">
-<h2 id="org7e6ef98">CryptPad</h2>
-<div class="outline-text-2" id="text-org7e6ef98">
+<div id="outline-container-org1b15bc8" class="outline-2">
+<h2 id="org1b15bc8">BDS Mail</h2>
+<div class="outline-text-2" id="text-org1b15bc8">
+<p>
+It's like ordinary email, but with <a href="https://en.wikipedia.org/wiki/I2P">i2p</a> as the transport mechanism.
+</p>
+
+<p>
+<a href="./app_bdsmail.html">How to use it</a>
+</p>
+</div>
+</div>
+<div id="outline-container-org3782541" class="outline-2">
+<h2 id="org3782541">CryptPad</h2>
+<div class="outline-text-2" id="text-org3782541">
 <p>
 Collaborate on editing documents, presentations and source code, or vote on things. All with a good level of security.
 </p>
@@ -289,9 +301,9 @@ Collaborate on editing documents, presentations and source code, or vote on thin
 </p>
 </div>
 </div>
-<div id="outline-container-orgb6914dd" class="outline-2">
-<h2 id="orgb6914dd">DLNA</h2>
-<div class="outline-text-2" id="text-orgb6914dd">
+<div id="outline-container-org9361ad2" class="outline-2">
+<h2 id="org9361ad2">DLNA</h2>
+<div class="outline-text-2" id="text-org9361ad2">
 <p>
 Enables you to use the system as a music server which any DLNA compatible devices can connect to within your home network.
 </p>
@@ -301,9 +313,9 @@ Enables you to use the system as a music server which any DLNA compatible device
 </p>
 </div>
 </div>
-<div id="outline-container-orgc23c65e" class="outline-2">
-<h2 id="orgc23c65e">Dokuwiki</h2>
-<div class="outline-text-2" id="text-orgc23c65e">
+<div id="outline-container-orgc1b9f8d" class="outline-2">
+<h2 id="orgc1b9f8d">Dokuwiki</h2>
+<div class="outline-text-2" id="text-orgc1b9f8d">
 <p>
 A databaseless wiki system.
 </p>
@@ -313,9 +325,9 @@ A databaseless wiki system.
 </p>
 </div>
 </div>
-<div id="outline-container-orgf803ba9" class="outline-2">
-<h2 id="orgf803ba9">Edith</h2>
-<div class="outline-text-2" id="text-orgf803ba9">
+<div id="outline-container-org809c5af" class="outline-2">
+<h2 id="org809c5af">Edith</h2>
+<div class="outline-text-2" id="text-org809c5af">
 <p>
 Extremely simple and distraction-free notes system.
 </p>
@@ -325,9 +337,9 @@ Extremely simple and distraction-free notes system.
 </p>
 </div>
 </div>
-<div id="outline-container-orgfd2155a" class="outline-2">
-<h2 id="orgfd2155a">Emacs</h2>
-<div class="outline-text-2" id="text-orgfd2155a">
+<div id="outline-container-org2950e2c" class="outline-2">
+<h2 id="org2950e2c">Emacs</h2>
+<div class="outline-text-2" id="text-org2950e2c">
 <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>
@@ -337,9 +349,9 @@ 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-org5fcc9ff" class="outline-2">
-<h2 id="org5fcc9ff">Etherpad</h2>
-<div class="outline-text-2" id="text-org5fcc9ff">
+<div id="outline-container-org2349efd" class="outline-2">
+<h2 id="org2349efd">Etherpad</h2>
+<div class="outline-text-2" id="text-org2349efd">
 <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>
@@ -349,9 +361,9 @@ Collaborate on creating documents in real time. Maybe you're planning a holiday
 </p>
 </div>
 </div>
-<div id="outline-container-orgdc50344" class="outline-2">
-<h2 id="orgdc50344">Federated wiki</h2>
-<div class="outline-text-2" id="text-orgdc50344">
+<div id="outline-container-orgbc1e58a" class="outline-2">
+<h2 id="orgbc1e58a">Federated wiki</h2>
+<div class="outline-text-2" id="text-orgbc1e58a">
 <p>
 A new approach to creating wiki content.
 </p>
@@ -361,9 +373,9 @@ A new approach to creating wiki content.
 </p>
 </div>
 </div>
-<div id="outline-container-org30bda20" class="outline-2">
-<h2 id="org30bda20">Friendica</h2>
-<div class="outline-text-2" id="text-org30bda20">
+<div id="outline-container-org806878a" class="outline-2">
+<h2 id="org806878a">Friendica</h2>
+<div class="outline-text-2" id="text-org806878a">
 <p>
 Federated social network system.
 </p>
@@ -373,9 +385,9 @@ Federated social network system.
 </p>
 </div>
 </div>
-<div id="outline-container-org98e4708" class="outline-2">
-<h2 id="org98e4708">Ghost</h2>
-<div class="outline-text-2" id="text-org98e4708">
+<div id="outline-container-org13b6601" class="outline-2">
+<h2 id="org13b6601">Ghost</h2>
+<div class="outline-text-2" id="text-org13b6601">
 <p>
 Modern looking blogging system.
 </p>
@@ -385,9 +397,9 @@ Modern looking blogging system.
 </p>
 </div>
 </div>
-<div id="outline-container-orgcd73257" class="outline-2">
-<h2 id="orgcd73257">GNU Social</h2>
-<div class="outline-text-2" id="text-orgcd73257">
+<div id="outline-container-org18b5451" class="outline-2">
+<h2 id="org18b5451">GNU Social</h2>
+<div class="outline-text-2" id="text-org18b5451">
 <p>
 Federated social network based on the OStatus protocol. You can "<i>remote follow</i>" other users within the GNU Social federation.
 </p>
@@ -397,9 +409,9 @@ Federated social network based on the OStatus protocol. You can "<i>remote follo
 </p>
 </div>
 </div>
-<div id="outline-container-org5f6afde" class="outline-2">
-<h2 id="org5f6afde">Gogs</h2>
-<div class="outline-text-2" id="text-org5f6afde">
+<div id="outline-container-org877ac0a" class="outline-2">
+<h2 id="org877ac0a">Gogs</h2>
+<div class="outline-text-2" id="text-org877ac0a">
 <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>
@@ -409,9 +421,9 @@ Lightweight git project hosting system. You can mirror projects from Github, or
 </p>
 </div>
 </div>
-<div id="outline-container-org4d1d8ba" class="outline-2">
-<h2 id="org4d1d8ba">HTMLy</h2>
-<div class="outline-text-2" id="text-org4d1d8ba">
+<div id="outline-container-orga2ff624" class="outline-2">
+<h2 id="orga2ff624">HTMLy</h2>
+<div class="outline-text-2" id="text-orga2ff624">
 <p>
 Databaseless blogging system. Quite simple and with a markdown-like format.
 </p>
@@ -421,9 +433,9 @@ Databaseless blogging system. Quite simple and with a markdown-like format.
 </p>
 </div>
 </div>
-<div id="outline-container-org4039820" class="outline-2">
-<h2 id="org4039820">Hubzilla</h2>
-<div class="outline-text-2" id="text-org4039820">
+<div id="outline-container-org807c97c" class="outline-2">
+<h2 id="org807c97c">Hubzilla</h2>
+<div class="outline-text-2" id="text-org807c97c">
 <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>
@@ -433,9 +445,9 @@ Web publishing platform with social network like features and good privacy contr
 </p>
 </div>
 </div>
-<div id="outline-container-orgd7ea9f5" class="outline-2">
-<h2 id="orgd7ea9f5">Icecast media stream</h2>
-<div class="outline-text-2" id="text-orgd7ea9f5">
+<div id="outline-container-org95e3282" class="outline-2">
+<h2 id="org95e3282">Icecast media stream</h2>
+<div class="outline-text-2" id="text-org95e3282">
 <p>
 Make your own internet radio station.
 </p>
@@ -445,9 +457,9 @@ Make your own internet radio station.
 </p>
 </div>
 </div>
-<div id="outline-container-org4b18262" class="outline-2">
-<h2 id="org4b18262">IRC Server (ngirc)</h2>
-<div class="outline-text-2" id="text-org4b18262">
+<div id="outline-container-orgd272c05" class="outline-2">
+<h2 id="orgd272c05">IRC Server (ngirc)</h2>
+<div class="outline-text-2" id="text-orgd272c05">
 <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>
@@ -457,18 +469,18 @@ Run your own IRC chat channel which can be secured with a password and accessibl
 </p>
 </div>
 </div>
-<div id="outline-container-org3244c52" class="outline-2">
-<h2 id="org3244c52">Jitsi Meet</h2>
-<div class="outline-text-2" id="text-org3244c52">
+<div id="outline-container-org6b54bf7" class="outline-2">
+<h2 id="org6b54bf7">Jitsi Meet</h2>
+<div class="outline-text-2" id="text-org6b54bf7">
 <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-org7f54f3b" class="outline-2">
-<h2 id="org7f54f3b">KanBoard</h2>
-<div class="outline-text-2" id="text-org7f54f3b">
+<div id="outline-container-org0604538" class="outline-2">
+<h2 id="org0604538">KanBoard</h2>
+<div class="outline-text-2" id="text-org0604538">
 <p>
 A simple kanban system for managing projects or TODO lists.
 </p>
@@ -478,9 +490,9 @@ A simple kanban system for managing projects or TODO lists.
 </p>
 </div>
 </div>
-<div id="outline-container-org511a639" class="outline-2">
-<h2 id="org511a639">Key Server</h2>
-<div class="outline-text-2" id="text-org511a639">
+<div id="outline-container-orgcd31aa0" class="outline-2">
+<h2 id="orgcd31aa0">Key Server</h2>
+<div class="outline-text-2" id="text-orgcd31aa0">
 <p>
 An OpenPGP key server for storing and retrieving GPG public keys.
 </p>
@@ -490,9 +502,9 @@ An OpenPGP key server for storing and retrieving GPG public keys.
 </p>
 </div>
 </div>
-<div id="outline-container-org058add3" class="outline-2">
-<h2 id="org058add3">Koel</h2>
-<div class="outline-text-2" id="text-org058add3">
+<div id="outline-container-org18f0038" class="outline-2">
+<h2 id="org18f0038">Koel</h2>
+<div class="outline-text-2" id="text-org18f0038">
 <p>
 Access your music collection from any internet connected device.
 </p>
@@ -502,9 +514,9 @@ Access your music collection from any internet connected device.
 </p>
 </div>
 </div>
-<div id="outline-container-org611fc47" class="outline-2">
-<h2 id="org611fc47">Lychee</h2>
-<div class="outline-text-2" id="text-org611fc47">
+<div id="outline-container-orgdac8618" class="outline-2">
+<h2 id="orgdac8618">Lychee</h2>
+<div class="outline-text-2" id="text-orgdac8618">
 <p>
 Make your photo albums available on the web.
 </p>
@@ -514,9 +526,9 @@ Make your photo albums available on the web.
 </p>
 </div>
 </div>
-<div id="outline-container-org3a59d15" class="outline-2">
-<h2 id="org3a59d15">Mailpile</h2>
-<div class="outline-text-2" id="text-org3a59d15">
+<div id="outline-container-org2f65f95" class="outline-2">
+<h2 id="org2f65f95">Mailpile</h2>
+<div class="outline-text-2" id="text-org2f65f95">
 <p>
 Modern email client which supports GPG encryption.
 </p>
@@ -526,9 +538,9 @@ Modern email client which supports GPG encryption.
 </p>
 </div>
 </div>
-<div id="outline-container-org36c7c61" class="outline-2">
-<h2 id="org36c7c61">Matrix</h2>
-<div class="outline-text-2" id="text-org36c7c61">
+<div id="outline-container-org35b7261" class="outline-2">
+<h2 id="org35b7261">Matrix</h2>
+<div class="outline-text-2" id="text-org35b7261">
 <p>
 Multi-user chat with some security and moderation controls.
 </p>
@@ -538,9 +550,9 @@ Multi-user chat with some security and moderation controls.
 </p>
 </div>
 </div>
-<div id="outline-container-org69bd95e" class="outline-2">
-<h2 id="org69bd95e">Mediagoblin</h2>
-<div class="outline-text-2" id="text-org69bd95e">
+<div id="outline-container-orgf522d1b" class="outline-2">
+<h2 id="orgf522d1b">Mediagoblin</h2>
+<div class="outline-text-2" id="text-orgf522d1b">
 <p>
 Publicly host video and audio files so that you don't need to use YouTube/Vimeo/etc.
 </p>
@@ -550,9 +562,9 @@ Publicly host video and audio files so that you don't need to use YouTube/Vimeo/
 </p>
 </div>
 </div>
-<div id="outline-container-org083b086" class="outline-2">
-<h2 id="org083b086">Mumble</h2>
-<div class="outline-text-2" id="text-org083b086">
+<div id="outline-container-orgdd0c788" class="outline-2">
+<h2 id="orgdd0c788">Mumble</h2>
+<div class="outline-text-2" id="text-orgdd0c788">
 <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>
@@ -562,9 +574,9 @@ The popular VoIP and text chat system. Say goodbye to old-fashioned telephony co
 </p>
 </div>
 </div>
-<div id="outline-container-orga89941d" class="outline-2">
-<h2 id="orga89941d">NextCloud</h2>
-<div class="outline-text-2" id="text-orga89941d">
+<div id="outline-container-org29456cf" class="outline-2">
+<h2 id="org29456cf">NextCloud</h2>
+<div class="outline-text-2" id="text-org29456cf">
 <p>
 Store files on your server and sync them with laptops or mobile devices. Includes many plugins including videoconferencing and collaborative document editing.
 </p>
@@ -574,9 +586,9 @@ Store files on your server and sync them with laptops or mobile devices. Include
 </p>
 </div>
 </div>
-<div id="outline-container-org1855642" class="outline-2">
-<h2 id="org1855642">PeerTube</h2>
-<div class="outline-text-2" id="text-org1855642">
+<div id="outline-container-orgbcb8568" class="outline-2">
+<h2 id="orgbcb8568">PeerTube</h2>
+<div class="outline-text-2" id="text-orgbcb8568">
 <p>
 Peer-to-peer video hosting. Similar to Mediagoblin, but the P2P aspect better enables the streaming load to be shared across servers.
 </p>
@@ -586,9 +598,9 @@ Peer-to-peer video hosting. Similar to Mediagoblin, but the P2P aspect better en
 </p>
 </div>
 </div>
-<div id="outline-container-org75f549b" class="outline-2">
-<h2 id="org75f549b">PI-Hole</h2>
-<div class="outline-text-2" id="text-org75f549b">
+<div id="outline-container-org46e7bef" class="outline-2">
+<h2 id="org46e7bef">PI-Hole</h2>
+<div class="outline-text-2" id="text-org46e7bef">
 <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>
@@ -598,9 +610,9 @@ The black hole for web adverts. Block adverts at the domain name level within yo
 </p>
 </div>
 </div>
-<div id="outline-container-orga1fbb11" class="outline-2">
-<h2 id="orga1fbb11">PostActiv</h2>
-<div class="outline-text-2" id="text-orga1fbb11">
+<div id="outline-container-orgf349fcf" class="outline-2">
+<h2 id="orgf349fcf">PostActiv</h2>
+<div class="outline-text-2" id="text-orgf349fcf">
 <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>
@@ -610,9 +622,9 @@ An alternative federated social networking system compatible with GNU Social, Pl
 </p>
 </div>
 </div>
-<div id="outline-container-org1448160" class="outline-2">
-<h2 id="org1448160">PrivateBin</h2>
-<div class="outline-text-2" id="text-org1448160">
+<div id="outline-container-org842b0ba" class="outline-2">
+<h2 id="org842b0ba">PrivateBin</h2>
+<div class="outline-text-2" id="text-org842b0ba">
 <p>
 A pastebin where the server has zero knowledge of the content being pasted.
 </p>
@@ -622,9 +634,9 @@ A pastebin where the server has zero knowledge of the content being pasted.
 </p>
 </div>
 </div>
-<div id="outline-container-org9d310cf" class="outline-2">
-<h2 id="org9d310cf">Profanity</h2>
-<div class="outline-text-2" id="text-org9d310cf">
+<div id="outline-container-org75de424" class="outline-2">
+<h2 id="org75de424">Profanity</h2>
+<div class="outline-text-2" id="text-org75de424">
 <p>
 A shell based XMPP client which you can run on the Freedombone server via ssh.
 </p>
@@ -634,9 +646,9 @@ A shell based XMPP client which you can run on the Freedombone server via ssh.
 </p>
 </div>
 </div>
-<div id="outline-container-orge6aa619" class="outline-2">
-<h2 id="orge6aa619">Riot Web</h2>
-<div class="outline-text-2" id="text-orge6aa619">
+<div id="outline-container-org127dc3f" class="outline-2">
+<h2 id="org127dc3f">Riot Web</h2>
+<div class="outline-text-2" id="text-org127dc3f">
 <p>
 A browser based user interface for the Matrix federated communications system, including WebRTC audio and video chat.
 </p>
@@ -646,9 +658,9 @@ A browser based user interface for the Matrix federated communications system, i
 </p>
 </div>
 </div>
-<div id="outline-container-org50e63cb" class="outline-2">
-<h2 id="org50e63cb">SearX</h2>
-<div class="outline-text-2" id="text-org50e63cb">
+<div id="outline-container-org179bd91" class="outline-2">
+<h2 id="org179bd91">SearX</h2>
+<div class="outline-text-2" id="text-org179bd91">
 <p>
 A metasearch engine for customised and private web searches.
 </p>
@@ -658,9 +670,9 @@ A metasearch engine for customised and private web searches.
 </p>
 </div>
 </div>
-<div id="outline-container-orgec6ad33" class="outline-2">
-<h2 id="orgec6ad33">tt-rss</h2>
-<div class="outline-text-2" id="text-orgec6ad33">
+<div id="outline-container-orgffb086f" class="outline-2">
+<h2 id="orgffb086f">tt-rss</h2>
+<div class="outline-text-2" id="text-orgffb086f">
 <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>
@@ -670,9 +682,9 @@ Private RSS reader. Pulls in RSS/Atom feeds via Tor and is only accessible via a
 </p>
 </div>
 </div>
-<div id="outline-container-org4de6eec" class="outline-2">
-<h2 id="org4de6eec">Syncthing</h2>
-<div class="outline-text-2" id="text-org4de6eec">
+<div id="outline-container-org69b4a9f" class="outline-2">
+<h2 id="org69b4a9f">Syncthing</h2>
+<div class="outline-text-2" id="text-org69b4a9f">
 <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>
@@ -682,9 +694,9 @@ Possibly the best way to synchronise files across all of your devices. Once it h
 </p>
 </div>
 </div>
-<div id="outline-container-orgebbf48a" class="outline-2">
-<h2 id="orgebbf48a">Tahoe-LAFS</h2>
-<div class="outline-text-2" id="text-orgebbf48a">
+<div id="outline-container-org289e2f4" class="outline-2">
+<h2 id="org289e2f4">Tahoe-LAFS</h2>
+<div class="outline-text-2" id="text-org289e2f4">
 <p>
 Robust and encrypted storage of files on one or more server.
 </p>
@@ -694,9 +706,9 @@ Robust and encrypted storage of files on one or more server.
 </p>
 </div>
 </div>
-<div id="outline-container-org3275ee7" class="outline-2">
-<h2 id="org3275ee7">Tox</h2>
-<div class="outline-text-2" id="text-org3275ee7">
+<div id="outline-container-org9660e8b" class="outline-2">
+<h2 id="org9660e8b">Tox</h2>
+<div class="outline-text-2" id="text-org9660e8b">
 <p>
 Client and bootstrap node for the Tox chat/VoIP system.
 </p>
@@ -706,9 +718,9 @@ Client and bootstrap node for the Tox chat/VoIP system.
 </p>
 </div>
 </div>
-<div id="outline-container-orgceb6c24" class="outline-2">
-<h2 id="orgceb6c24">Turtl</h2>
-<div class="outline-text-2" id="text-orgceb6c24">
+<div id="outline-container-org98827e8" class="outline-2">
+<h2 id="org98827e8">Turtl</h2>
+<div class="outline-text-2" id="text-org98827e8">
 <p>
 A system for privately creating and sharing notes and images, similar to Evernote but without the spying.
 </p>
@@ -718,18 +730,18 @@ A system for privately creating and sharing notes and images, similar to Evernot
 </p>
 </div>
 </div>
-<div id="outline-container-org1216de4" class="outline-2">
-<h2 id="org1216de4">Vim</h2>
-<div class="outline-text-2" id="text-org1216de4">
+<div id="outline-container-orgb94b916" class="outline-2">
+<h2 id="orgb94b916">Vim</h2>
+<div class="outline-text-2" id="text-orgb94b916">
 <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-org057b184" class="outline-2">
-<h2 id="org057b184">Virtual Private Network (VPN)</h2>
-<div class="outline-text-2" id="text-org057b184">
+<div id="outline-container-org78963d2" class="outline-2">
+<h2 id="org78963d2">Virtual Private Network (VPN)</h2>
+<div class="outline-text-2" id="text-org78963d2">
 <p>
 Set up a VPN on your server so that you can bypass local internet censorship.
 </p>
@@ -739,9 +751,9 @@ Set up a VPN on your server so that you can bypass local internet censorship.
 </p>
 </div>
 </div>
-<div id="outline-container-org93a66a0" class="outline-2">
-<h2 id="org93a66a0">XMPP</h2>
-<div class="outline-text-2" id="text-org93a66a0">
+<div id="outline-container-orgd631bb2" class="outline-2">
+<h2 id="orgd631bb2">XMPP</h2>
+<div class="outline-text-2" id="text-orgd631bb2">
 <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>