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

doc/EN/app_edith.org

@@ -0,0 +1,31 @@
+#+TITLE:
+#+AUTHOR: Bob Mottram
+#+EMAIL: bob@freedombone.net
+#+KEYWORDS: freedombone, edith, notes
+#+DESCRIPTION: How to use Edith notes
+#+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>Edith Notes</h1>
+</center>
+#+END_EXPORT
+
+Edith notes is the simplest and quickest kind of notes system. It has no complicated user interface. Just enter your domain and a title and a note will be created. Everything typed is saved automatically.
+
+The speed and minimalism of this type of notes system may make it suitable for things like shopping lists or distraction free writing.
+
+ssh into the system with:
+
+#+BEGIN_SRC bash
+ssh myusername@mydomain.com -p 2222
+#+END_SRC
+
+Select *Administrator controls* then *App Settings* then *edith*. Enter a subdomain name, such as /notes.mydomain.com/, and optionally a freedns code. When the installation is complete you can then look up the password for the site within the *Passwords* section of the *Administrator control panel*, then  navigate to the subdomain. Log in, then enter something like /notes.mydomain.com/testnote/ and start typing.
+
+It is possible to turn off the login via *App Settings/edith* if you wish, but this will enable anyone on the internet to view or edit notes on your system, which could have obvious privacy or stability implications. From *App settings/edith* it's also possible to browse through your notes files.

doc/EN/apps.org

@@ -41,6 +41,10 @@ Enables you to use the system as a music server which any DLNA compatible device
 A databaseless wiki system.
 
 [[./app_dokuwiki.html][How to use it]]
+* Edith
+Extremely simple and distraction-free notes system.
+
+[[./app_edith.html][How to use it]]
 * Emacs
 If you use the Mutt client to read your email then this will set it up to use emacs for composing new mail.
 

src/freedombone-app-edith

@@ -0,0 +1,441 @@
+#!/bin/bash
+#
+# .---.                  .              .
+# |                      |              |
+# |--- .--. .-.  .-.  .-.|  .-. .--.--. |.-.  .-. .--.  .-.
+# |    |   (.-' (.-' (   | (   )|  |  | |   )(   )|  | (.-'
+# '    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'
+#
+#                    Freedom in the Cloud
+#
+# Edith: an ultra simple notes application
+#
+# 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/>.
+
+VARIANTS='full full-vim writer'
+
+IN_DEFAULT_INSTALL=0
+SHOW_ON_ABOUT=1
+
+EDITH_REPO="https://github.com/sunny/edith"
+EDITH_COMMIT='59f571e24be9e75d127a0f130591acf8d7a86ce3'
+EDITH_DOMAIN_NAME=
+EDITH_CODE=
+EDITH_ONION_PORT=8278
+EDITH_LOGIN_TEXT=$"Edith login"
+
+edith_variables=(MY_USERNAME
+                 MY_EMAIL_ADDRESS
+                 ONION_ONLY
+                 EDITH_DOMAIN_NAME
+                 EDITH_CODE
+                 DEFAULT_LANGUAGE)
+
+function change_password_edith {
+    curr_username="$1"
+    new_user_password="$2"
+
+    sed -i "/${curr_username}:/d" /etc/nginx/.edithpasswd
+    echo -n "$new_user_password" | htpasswd -i -s -c /etc/nginx/.edithpasswd ${curr_username}
+
+    ${PROJECT_NAME}-pass -u $MY_USERNAME -a ${curr_username} -p "$new_user_password"
+}
+
+function logging_on_edith {
+    echo -n ''
+}
+
+function logging_off_edith {
+    echo -n ''
+}
+
+function reconfigure_edith {
+    echo -n ''
+}
+
+function edith_enable_login {
+    read_config_param EDITH_DOMAIN_NAME
+
+    dialog --title $"Enable Edith login" \
+           --backtitle $"Freedombone Control Panel" \
+           --defaultno \
+           --yesno $"\nDo you want to add a login so that random web users can't access your notes?" 10 60
+    sel=$?
+    case $sel in
+        0) if grep -q '#auth_basic' /etc/nginx/sites-available/$EDITH_DOMAIN_NAME; then
+               sed -i 's|#auth_basic|auth_basic|g' /etc/nginx/sites-available/$EDITH_DOMAIN_NAME
+               systemctl restart nginx
+           fi
+           read_config_param $MY_USERNAME
+           EDITH_PASSWORD=$(${PROJECT_NAME}-pass -u $MY_USERNAME -a edith)
+           dialog --title $"Enable Edith login" \
+                  --msgbox $"Edith logins are now enabled with the password $EDITH_PASSWORD" 6 65
+           EDITH__PASSWORD=
+           ;;
+        1) if ! grep -q '#auth_basic' /etc/nginx/sites-available/$EDITH_DOMAIN_NAME; then
+               sed -i 's|auth_basic|#auth_basic|g' /etc/nginx/sites-available/$EDITH_DOMAIN_NAME
+               systemctl restart nginx
+           fi
+           dialog --title $"Disable Edith login" \
+                  --msgbox $"Edith logins are now disabled. Anyone can access your stream." 6 65
+           ;;
+    esac
+}
+
+function edith_browse {
+    read_config_param EDITH_DOMAIN_NAME
+    cd /var/www/$EDITH_DOMAIN_NAME/htdocs/data
+    editor /var/www/$EDITH_DOMAIN_NAME/htdocs/data
+}
+
+function configure_interactive_edith {
+    while true
+    do
+        data=$(tempfile 2>/dev/null)
+        trap "rm -f $data" 0 1 2 5 15
+        dialog --backtitle $"Freedombone Control Panel" \
+               --title $"Edith" \
+               --radiolist $"Choose an operation:" 10 50 3 \
+               1 $"Enable login" off \
+               2 $"Browse notes" off \
+               3 $"Exit" on 2> $data
+        sel=$?
+        case $sel in
+            1) break;;
+            255) break;;
+        esac
+        case $(cat $data) in
+            1) edith_enable_login;;
+            2) edith_browse;;
+            3) break;;
+        esac
+    done
+}
+
+function upgrade_edith {
+    CURR_EDITH_COMMIT=$(get_completion_param "edith commit")
+    if [[ "$CURR_EDITH_COMMIT" == "$EDITH_COMMIT" ]]; then
+        return
+    fi
+
+    read_config_param EDITH_DOMAIN_NAME
+
+    # update to the next commit
+    function_check set_repo_commit
+    set_repo_commit /var/www/$EDITH_DOMAIN_NAME/htdocs "edith commit" "$EDITH_COMMIT" $EDITH_REPO
+
+    chown -R www-data:www-data /var/www/$EDITH_DOMAIN_NAME/htdocs
+    chmod a+w /var/www/$EDITH_DOMAIN_NAME/htdocs/data
+}
+
+function backup_local_edith {
+    read_config_param EDITH_DOMAIN_NAME
+
+    function_check suspend_site
+    suspend_site ${EDITH_DOMAIN_NAME}
+
+    source_directory=/var/www/${EDITH_DOMAIN_NAME}/htdocs/data
+
+    function_check backup_directory_to_usb
+    dest_directory=edith
+    backup_directory_to_usb $source_directory $dest_directory
+
+    function_check restart_site
+    restart_site
+}
+
+function restore_local_edith {
+    read_config_param EDITH_DOMAIN_NAME
+
+    temp_restore_dir=/root/tempedith
+    edith_dir=/var/www/${EDITH_DOMAIN_NAME}/htdocs/data
+
+    function_check restore_directory_from_usb
+    restore_directory_from_usb $temp_restore_dir edith
+    if [ -d $temp_restore_dir ]; then
+        if [ -d cp $temp_restore_dir$edith_dir ]; then
+            cp -rp $temp_restore_dir$edith_dir $edith_dir/
+        else
+            if [ ! -d $edith_dir ]; then
+                mkdir $edith_dir
+                chmod a+w $edith_dir
+            fi
+            cp -rp $temp_restore_dir/* $edith_dir
+        fi
+        chown -R www-data:www-data $edith_dir
+        rm -rf $temp_restore_dir
+    fi
+}
+
+function backup_remote_edith {
+    read_config_param EDITH_DOMAIN_NAME
+
+    function_check suspend_site
+    suspend_site ${EDITH_DOMAIN_NAME}
+
+    source_directory=/var/www/${EDITH_DOMAIN_NAME}/htdocs/data
+
+    function_check backup_directory_to_friend
+    dest_directory=edith
+    backup_directory_to_friend $source_directory $dest_directory
+
+    function_check restart_site
+    restart_site
+}
+
+function restore_remote_edith {
+    read_config_param EDITH_DOMAIN_NAME
+
+    temp_restore_dir=/root/tempedith
+    edith_dir=/var/www/${EDITH_DOMAIN_NAME}/htdocs/data
+
+    function_check restore_directory_from_friend
+    restore_directory_from_friend $temp_restore_dir edith
+    if [ -d $temp_restore_dir ]; then
+        if [ -d cp $temp_restore_dir$edith_dir ]; then
+            cp -rp $temp_restore_dir$edith_dir $edith_dir/
+        else
+            if [ ! -d $edith_dir ]; then
+                mkdir $edith_dir
+                chmod a+w $edith_dir
+            fi
+            cp -rp $temp_restore_dir/* $edith_dir
+        fi
+        chown -R www-data:www-data $edith_dir
+        rm -rf $temp_restore_dir
+    fi
+}
+
+function remove_edith {
+    nginx_dissite $EDITH_DOMAIN_NAME
+
+    if [ -f /etc/nginx/sites-available/$EDITH_DOMAIN_NAME ]; then
+        rm /etc/nginx/sites-available/$EDITH_DOMAIN_NAME
+    fi
+
+    if [ -d /var/www/$EDITH_DOMAIN_NAME ]; then
+        rm -rf /var/www/$EDITH_DOMAIN_NAME
+    fi
+
+    function_check remove_onion_service
+    remove_onion_service edith ${EDITH_ONION_PORT}
+    sed -i '/edith/d' $COMPLETION_FILE
+
+    if [ -f /etc/nginx/.edithpasswd ]; then
+        rm /etc/nginx/.edithpasswd
+    fi
+
+    function_check remove_nodejs
+    remove_nodejs edith
+
+    remove_certs $EDITH_DOMAIN_NAME
+    remove_app edith
+
+    function_check remove_ddns_domain
+    remove_ddns_domain $EDITH_DOMAIN_NAME
+}
+
+function install_edith {
+    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
+
+    function_check install_nodejs
+    install_nodejs edith
+
+    if [ ! ${EDITH_PASSWORD} ]; then
+        if [ -f ${IMAGE_PASSWORD_FILE} ]; then
+            EDITH_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
+        else
+            EDITH_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
+        fi
+    fi
+
+
+    if [ -d /var/www/$EDITH_DOMAIN_NAME/htdocs ]; then
+        rm -rf /var/www/$EDITH_DOMAIN_NAME/htdocs
+    fi
+
+    if [ -d /repos/edith ]; then
+        mkdir /var/www/$EDITH_DOMAIN_NAME/htdocs
+        cp -r -p /repos/edith/. /var/www/$EDITH_DOMAIN_NAME/htdocs
+        cd /var/www/$EDITH_DOMAIN_NAME/htdocs
+        git pull
+    else
+        function_check git_clone
+        git_clone $EDITH_REPO /var/www/$EDITH_DOMAIN_NAME/htdocs
+    fi
+
+    if [ ! -d /var/www/$EDITH_DOMAIN_NAME/htdocs ]; then
+        echo $'Unable to clone edith repo'
+        exit 537593569
+    fi
+
+    cd /var/www/$EDITH_DOMAIN_NAME/htdocs
+    git checkout $EDITH_COMMIT -b $EDITH_COMMIT
+    set_completion_param "edith commit" "$EDITH_COMMIT"
+
+    if [ ! -d /var/www/$EDITH_DOMAIN_NAME/htdocs/data ]; then
+        mkdir -p /var/www/$EDITH_DOMAIN_NAME/htdocs/data
+    fi
+
+    EDITH_ONION_HOSTNAME=$(add_onion_service edith 80 ${EDITH_ONION_PORT})
+
+    edith_nginx_site=/etc/nginx/sites-available/$EDITH_DOMAIN_NAME
+    if [[ $ONION_ONLY == "no" ]]; then
+        function_check nginx_http_redirect
+        nginx_http_redirect $EDITH_DOMAIN_NAME "index index.php"
+        echo 'server {' >> $edith_nginx_site
+        echo '  listen 443 ssl;' >> $edith_nginx_site
+        echo '  listen [::]:443 ssl;' >> $edith_nginx_site
+        echo "  server_name $EDITH_DOMAIN_NAME;" >> $edith_nginx_site
+        echo '' >> $edith_nginx_site
+        function_check nginx_compress
+        nginx_compress $EDITH_DOMAIN_NAME
+        echo '' >> $edith_nginx_site
+        echo '  # Security' >> $edith_nginx_site
+        function_check nginx_ssl
+        nginx_ssl $EDITH_DOMAIN_NAME
+
+        function_check nginx_disable_sniffing
+        nginx_disable_sniffing $EDITH_DOMAIN_NAME
+
+        echo '  add_header Strict-Transport-Security max-age=15768000;' >> $edith_nginx_site
+        echo '' >> $edith_nginx_site
+        echo '  access_log /dev/null;' >> $edith_nginx_site
+        echo '  error_log /dev/null;' >> $edith_nginx_site
+        echo '' >> $edith_nginx_site
+        echo "  root /var/www/$EDITH_DOMAIN_NAME/htdocs;" >> $edith_nginx_site
+        echo '' >> $edith_nginx_site
+        echo '  index index.php;' >> $edith_nginx_site
+        echo '' >> $edith_nginx_site
+        echo '  # PHP' >> $edith_nginx_site
+        echo '  location ~ \.php {' >> $edith_nginx_site
+        echo '    include snippets/fastcgi-php.conf;' >> $edith_nginx_site
+        echo '    fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;' >> $edith_nginx_site
+        echo '    fastcgi_read_timeout 30;' >> $edith_nginx_site
+        echo '  }' >> $edith_nginx_site
+        echo '' >> $edith_nginx_site
+        echo '  # Location' >> $edith_nginx_site
+        echo '  location / {' >> $edith_nginx_site
+        function_check nginx_limits
+        nginx_limits $EDITH_DOMAIN_NAME '15m'
+        echo '    try_files $uri $uri/ /index.php?$args;' >> $edith_nginx_site
+        echo "    auth_basic \"${EDITH_LOGIN_TEXT}\";" >> $edith_nginx_site
+        echo '    auth_basic_user_file /etc/nginx/.edithpasswd;' >> $edith_nginx_site
+        echo '  }' >> $edith_nginx_site
+        echo '}' >> $edith_nginx_site
+    else
+        echo -n '' > $edith_nginx_site
+    fi
+    echo 'server {' >> $edith_nginx_site
+    echo "    listen 127.0.0.1:$EDITH_ONION_PORT default_server;" >> $edith_nginx_site
+    echo "    server_name $EDITH_ONION_HOSTNAME;" >> $edith_nginx_site
+    echo '' >> $edith_nginx_site
+    function_check nginx_compress
+    nginx_compress $EDITH_DOMAIN_NAME
+    echo '' >> $edith_nginx_site
+    function_check nginx_disable_sniffing
+    nginx_disable_sniffing $EDITH_DOMAIN_NAME
+    echo '' >> $edith_nginx_site
+    echo '  access_log /dev/null;' >> $edith_nginx_site
+    echo '  error_log /dev/null;' >> $edith_nginx_site
+    echo '' >> $edith_nginx_site
+    echo "  root /var/www/$EDITH_DOMAIN_NAME/htdocs;" >> $edith_nginx_site
+    echo '' >> $edith_nginx_site
+    echo '  index index.php;' >> $edith_nginx_site
+    echo '' >> $edith_nginx_site
+    echo '  # PHP' >> $edith_nginx_site
+    echo '  location ~ \.php {' >> $edith_nginx_site
+    echo '    include snippets/fastcgi-php.conf;' >> $edith_nginx_site
+    echo '    fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;' >> $edith_nginx_site
+    echo '    fastcgi_read_timeout 30;' >> $edith_nginx_site
+    echo '  }' >> $edith_nginx_site
+    echo '' >> $edith_nginx_site
+    echo '  # Location' >> $edith_nginx_site
+    echo '  location / {' >> $edith_nginx_site
+    function_check nginx_limits
+    nginx_limits $EDITH_DOMAIN_NAME '15m'
+    echo '    try_files $uri $uri/ /index.php?$args;' >> $edith_nginx_site
+    echo "    auth_basic \"${EDITH_LOGIN_TEXT}\";" >> $edith_nginx_site
+    echo '    auth_basic_user_file /etc/nginx/.edithpasswd;' >> $edith_nginx_site
+    echo '  }' >> $edith_nginx_site
+    echo '}' >> $edith_nginx_site
+
+    function_check configure_php
+    configure_php
+
+    function_check create_site_certificate
+    create_site_certificate $EDITH_DOMAIN_NAME 'yes'
+
+    # create a password for users
+    if [ ! -f /etc/nginx/.edithpasswd ]; then
+        touch /etc/nginx/.edithpasswd
+    fi
+    if grep -q "$MY_USERNAME:" /etc/nginx/.edithpasswd; then
+        sed -i "/$MY_USERNAME:/d" /etc/nginx/.edithpasswd
+    fi
+    echo -n "$EDITH_PASSWORD" | htpasswd -i -s -c /etc/nginx/.edithpasswd $MY_USERNAME
+    if [ ! -f /etc/nginx/.edithpasswd ]; then
+        echo $'/etc/nginx/.edithpasswd not found'
+        exit 6537683563
+    fi
+
+    ${PROJECT_NAME}-pass -u $MY_USERNAME -a edith -p "$EDITH_PASSWORD"
+
+    cp /var/www/$EDITH_DOMAIN_NAME/htdocs/htaccess.example /var/www/$EDITH_DOMAIN_NAME/htdocs/.htaccess
+    cd /var/www/$EDITH_DOMAIN_NAME/htdocs
+    npm install -g coffeescript uglify-js
+    cake build
+    if [ ! "$?" = "0" ]; then
+        echo $'Unable to build Edith'
+        exit 7396483635
+    fi
+    cp config.example.php config.php
+    if [[ $ONION_ONLY == "no" ]]; then
+        sed -i "s|define('EDITH_URI'.*|define('EDITH_URI', 'https://$EDITH_DOMAIN_NAME');|g" config.php
+    else
+        sed -i "s|define('EDITH_URI'.*|define('EDITH_URI', 'http://$EDITH_ONION_HOSTNAME');|g" config.php
+    fi
+
+    set_completion_param "edith domain" "$EDITH_DOMAIN_NAME"
+    set_completion_param "edith onion domain" "$EDITH_ONION_HOSTNAME"
+    chown -R www-data:www-data /var/www/$EDITH_DOMAIN_NAME/htdocs
+    chmod a+w /var/www/$EDITH_DOMAIN_NAME/htdocs/data
+    nginx_ensite $EDITH_DAEMON_NAME
+    systemctl restart nginx
+
+    APP_INSTALLED=1
+}
+
+function install_interactive_edith {
+    if [ ! $ONION_ONLY ]; then
+        ONION_ONLY='no'
+    fi
+
+    if [[ $ONION_ONLY != "no" ]]; then
+        GHOST_DOMAIN_NAME='edith.local'
+        write_config_param "EDITH_DOMAIN_NAME" "$EDITH_DOMAIN_NAME"
+    else
+        function_check interactive_site_details
+        interactive_site_details "edith" "EDITH_DOMAIN_NAME" "EDITH_CODE"
+    fi
+    APP_INSTALLED=1
+}
+
+# NOTE: deliberately no exit 0

src/freedombone-app-emacs

@@ -188,7 +188,7 @@ function remove_emacs {
 
 function install_emacs {
     apt-get -yq install emacs ispell ibritish ifrench ispanish iitalian irussian iswedish inorwegian iirish ingerman iswiss iogerman idutch idanish ibrazilian ibulgarian ipolish iczech iestonian ilithuanian iukrainian icatalan
-    update-alternatives --set editor /usr/bin/emacs
+    update-alternatives --set editor /usr/bin/emacs24
 
     # A minimal emacs configuration
     #echo -n "(add-to-list 'load-path " > /home/$MY_USERNAME/.emacs

src/freedombone-app-vim

@@ -232,7 +232,7 @@ function remove_vim {
 
 function install_vim {
     apt-get -yq install vim
-    update-alternatives --set editor /usr/bin/vim
+    update-alternatives --set editor /usr/bin/vim.tiny
 
     # add a mutt entry to use Vim to compose emails
     if [ -f /etc/Muttrc ]; then

src/freedombone-controlpanel

@@ -289,7 +289,7 @@ function view_or_change_passwords {
     trap "rm -f $data" 0 1 2 5 15
     dialog --title "$titlestr" \
            --backtitle $"Freedombone Control Panel" \
-           --inputbox "$viewstr" 12 60 "$CURR_PASSWORD" 2>$data
+           --inputbox "$viewstr" 12 75 "$CURR_PASSWORD" 2>$data
     sel=$?
     case $sel in
         0)

src/freedombone-image-customise

@@ -1945,6 +1945,7 @@ function image_preinstall_repos {
     git clone $KEYSERVER_WEB_REPO $rootdir/repos/keyserverweb
     git clone $PEERTUBE_REPO $rootdir/repos/peertube
     git clone $PRIVATEBIN_REPO $rootdir/repos/privatebin
+    git clone $EDITH_REPO $rootdir/repos/edith
     #git clone $WEKAN_REPO $rootdir/repos/wekan
     #git clone $FLOW_ROUTER_REPO $rootdir/repos/flowrouter
     #git clone $METEOR_USERACCOUNTS_REPO $rootdir/repos/meteoruseraccounts

src/freedombone-utils-onion

@@ -83,8 +83,8 @@ function remove_onion_service {
     if [ ${#nick} -gt 0 ]; then
         sed -i "/stealth ${nick}/d" /etc/tor/torrc
     fi
-    sed -i "/hidden_service_${onion_service_name}/d" /etc/tor/torrc
-    sed -i "/hidden_service_${onion_service_name}_mobile/d" /etc/tor/torrc
+    sed -i "/hidden_service_${onion_service_name}/,+1 d" /etc/tor/torrc
+    sed -i "/hidden_service_${onion_service_name}_mobile/,+1 d" /etc/tor/torrc
     sed -i "/127.0.0.1:${onion_service_port_to}/d" /etc/tor/torrc
     if [ $3 ]; then
         sed -i "/127.0.0.1:${3}/d" /etc/tor/torrc

website/EN/app_edith.html

@@ -0,0 +1,301 @@
+<?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-02 Fri 14:45 -->
+<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 Edith notes"
+ />
+<meta name="keywords" content="freedombone, edith, notes" />
+<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>Edith Notes</h1>
+</center>
+
+<p>
+Edith notes is the simplest and quickest kind of notes system. It has no complicated user interface. Just enter your domain and a title and a note will be created. Everything typed is saved automatically.
+</p>
+
+<p>
+The speed and minimalism of this type of notes system may make it suitable for things like shopping lists or distraction free writing.
+</p>
+
+<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>edith</b>. Enter a subdomain name, such as <i>notes.mydomain.com</i>, and optionally a freedns code. When the installation is complete you can then look up the password for the site within the <b>Passwords</b> section of the <b>Administrator control panel</b>, then  navigate to the subdomain. Log in, then enter something like <i>notes.mydomain.com/testnote</i> and start typing.
+</p>
+
+<p>
+It is possible to turn off the login via <b>App Settings/edith</b> if you wish, but this will enable anyone on the internet to view or edit notes on your system, which could have obvious privacy or stability implications. From <b>App settings/edith</b> it's also possible to browse through your notes files.
+</p>
+</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-01-10 Wed 22:25 -->
+<!-- 2018-02-02 Fri 14:51 -->
 <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-org882df4a" class="outline-2">
-<h2 id="org882df4a">Akaunting</h2>
-<div class="outline-text-2" id="text-org882df4a">
+<div id="outline-container-org6873154" class="outline-2">
+<h2 id="org6873154">Akaunting</h2>
+<div class="outline-text-2" id="text-org6873154">
 <p>
 A web based accounts system for small businesses or freelancers.
 </p>
@@ -277,9 +277,9 @@ A web based accounts system for small businesses or freelancers.
 </p>
 </div>
 </div>
-<div id="outline-container-orge821a92" class="outline-2">
-<h2 id="orge821a92">CryptPad</h2>
-<div class="outline-text-2" id="text-orge821a92">
+<div id="outline-container-org7e6ef98" class="outline-2">
+<h2 id="org7e6ef98">CryptPad</h2>
+<div class="outline-text-2" id="text-org7e6ef98">
 <p>
 Collaborate on editing documents, presentations and source code, or vote on things. All with a good level of security.
 </p>
@@ -289,9 +289,9 @@ Collaborate on editing documents, presentations and source code, or vote on thin
 </p>
 </div>
 </div>
-<div id="outline-container-org6d56481" class="outline-2">
-<h2 id="org6d56481">DLNA</h2>
-<div class="outline-text-2" id="text-org6d56481">
+<div id="outline-container-orgb6914dd" class="outline-2">
+<h2 id="orgb6914dd">DLNA</h2>
+<div class="outline-text-2" id="text-orgb6914dd">
 <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 +301,9 @@ Enables you to use the system as a music server which any DLNA compatible device
 </p>
 </div>
 </div>
-<div id="outline-container-org0aaf2bf" class="outline-2">
-<h2 id="org0aaf2bf">Dokuwiki</h2>
-<div class="outline-text-2" id="text-org0aaf2bf">
+<div id="outline-container-orgc23c65e" class="outline-2">
+<h2 id="orgc23c65e">Dokuwiki</h2>
+<div class="outline-text-2" id="text-orgc23c65e">
 <p>
 A databaseless wiki system.
 </p>
@@ -313,9 +313,21 @@ A databaseless wiki system.
 </p>
 </div>
 </div>
-<div id="outline-container-orga523977" class="outline-2">
-<h2 id="orga523977">Emacs</h2>
-<div class="outline-text-2" id="text-orga523977">
+<div id="outline-container-orgf803ba9" class="outline-2">
+<h2 id="orgf803ba9">Edith</h2>
+<div class="outline-text-2" id="text-orgf803ba9">
+<p>
+Extremely simple and distraction-free notes system.
+</p>
+
+<p>
+<a href="./app_edith.html">How to use it</a>
+</p>
+</div>
+</div>
+<div id="outline-container-orgfd2155a" class="outline-2">
+<h2 id="orgfd2155a">Emacs</h2>
+<div class="outline-text-2" id="text-orgfd2155a">
 <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>
@@ -325,9 +337,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-org11ae2d9" class="outline-2">
-<h2 id="org11ae2d9">Etherpad</h2>
-<div class="outline-text-2" id="text-org11ae2d9">
+<div id="outline-container-org5fcc9ff" class="outline-2">
+<h2 id="org5fcc9ff">Etherpad</h2>
+<div class="outline-text-2" id="text-org5fcc9ff">
 <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>
@@ -337,9 +349,9 @@ Collaborate on creating documents in real time. Maybe you're planning a holiday
 </p>
 </div>
 </div>
-<div id="outline-container-org7f75cbc" class="outline-2">
-<h2 id="org7f75cbc">Federated wiki</h2>
-<div class="outline-text-2" id="text-org7f75cbc">
+<div id="outline-container-orgdc50344" class="outline-2">
+<h2 id="orgdc50344">Federated wiki</h2>
+<div class="outline-text-2" id="text-orgdc50344">
 <p>
 A new approach to creating wiki content.
 </p>
@@ -349,9 +361,9 @@ A new approach to creating wiki content.
 </p>
 </div>
 </div>
-<div id="outline-container-org538cc52" class="outline-2">
-<h2 id="org538cc52">Friendica</h2>
-<div class="outline-text-2" id="text-org538cc52">
+<div id="outline-container-org30bda20" class="outline-2">
+<h2 id="org30bda20">Friendica</h2>
+<div class="outline-text-2" id="text-org30bda20">
 <p>
 Federated social network system.
 </p>
@@ -361,9 +373,9 @@ Federated social network system.
 </p>
 </div>
 </div>
-<div id="outline-container-orga0e917c" class="outline-2">
-<h2 id="orga0e917c">Ghost</h2>
-<div class="outline-text-2" id="text-orga0e917c">
+<div id="outline-container-org98e4708" class="outline-2">
+<h2 id="org98e4708">Ghost</h2>
+<div class="outline-text-2" id="text-org98e4708">
 <p>
 Modern looking blogging system.
 </p>
@@ -373,9 +385,9 @@ Modern looking blogging system.
 </p>
 </div>
 </div>
-<div id="outline-container-org5741481" class="outline-2">
-<h2 id="org5741481">GNU Social</h2>
-<div class="outline-text-2" id="text-org5741481">
+<div id="outline-container-orgcd73257" class="outline-2">
+<h2 id="orgcd73257">GNU Social</h2>
+<div class="outline-text-2" id="text-orgcd73257">
 <p>
 Federated social network based on the OStatus protocol. You can "<i>remote follow</i>" other users within the GNU Social federation.
 </p>
@@ -385,9 +397,9 @@ Federated social network based on the OStatus protocol. You can "<i>remote follo
 </p>
 </div>
 </div>
-<div id="outline-container-org0b7fe9f" class="outline-2">
-<h2 id="org0b7fe9f">Gogs</h2>
-<div class="outline-text-2" id="text-org0b7fe9f">
+<div id="outline-container-org5f6afde" class="outline-2">
+<h2 id="org5f6afde">Gogs</h2>
+<div class="outline-text-2" id="text-org5f6afde">
 <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>
@@ -397,9 +409,9 @@ Lightweight git project hosting system. You can mirror projects from Github, or
 </p>
 </div>
 </div>
-<div id="outline-container-org0cb9182" class="outline-2">
-<h2 id="org0cb9182">HTMLy</h2>
-<div class="outline-text-2" id="text-org0cb9182">
+<div id="outline-container-org4d1d8ba" class="outline-2">
+<h2 id="org4d1d8ba">HTMLy</h2>
+<div class="outline-text-2" id="text-org4d1d8ba">
 <p>
 Databaseless blogging system. Quite simple and with a markdown-like format.
 </p>
@@ -409,9 +421,9 @@ Databaseless blogging system. Quite simple and with a markdown-like format.
 </p>
 </div>
 </div>
-<div id="outline-container-orgd9569c1" class="outline-2">
-<h2 id="orgd9569c1">Hubzilla</h2>
-<div class="outline-text-2" id="text-orgd9569c1">
+<div id="outline-container-org4039820" class="outline-2">
+<h2 id="org4039820">Hubzilla</h2>
+<div class="outline-text-2" id="text-org4039820">
 <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>
@@ -421,9 +433,9 @@ Web publishing platform with social network like features and good privacy contr
 </p>
 </div>
 </div>
-<div id="outline-container-orgab4800e" class="outline-2">
-<h2 id="orgab4800e">Icecast media stream</h2>
-<div class="outline-text-2" id="text-orgab4800e">
+<div id="outline-container-orgd7ea9f5" class="outline-2">
+<h2 id="orgd7ea9f5">Icecast media stream</h2>
+<div class="outline-text-2" id="text-orgd7ea9f5">
 <p>
 Make your own internet radio station.
 </p>
@@ -433,9 +445,9 @@ Make your own internet radio station.
 </p>
 </div>
 </div>
-<div id="outline-container-orgd862282" class="outline-2">
-<h2 id="orgd862282">IRC Server (ngirc)</h2>
-<div class="outline-text-2" id="text-orgd862282">
+<div id="outline-container-org4b18262" class="outline-2">
+<h2 id="org4b18262">IRC Server (ngirc)</h2>
+<div class="outline-text-2" id="text-org4b18262">
 <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>
@@ -445,18 +457,18 @@ Run your own IRC chat channel which can be secured with a password and accessibl
 </p>
 </div>
 </div>
-<div id="outline-container-orgd19b0f8" class="outline-2">
-<h2 id="orgd19b0f8">Jitsi Meet</h2>
-<div class="outline-text-2" id="text-orgd19b0f8">
+<div id="outline-container-org3244c52" class="outline-2">
+<h2 id="org3244c52">Jitsi Meet</h2>
+<div class="outline-text-2" id="text-org3244c52">
 <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-org4fd23ed" class="outline-2">
-<h2 id="org4fd23ed">KanBoard</h2>
-<div class="outline-text-2" id="text-org4fd23ed">
+<div id="outline-container-org7f54f3b" class="outline-2">
+<h2 id="org7f54f3b">KanBoard</h2>
+<div class="outline-text-2" id="text-org7f54f3b">
 <p>
 A simple kanban system for managing projects or TODO lists.
 </p>
@@ -466,9 +478,9 @@ A simple kanban system for managing projects or TODO lists.
 </p>
 </div>
 </div>
-<div id="outline-container-org091b6da" class="outline-2">
-<h2 id="org091b6da">Key Server</h2>
-<div class="outline-text-2" id="text-org091b6da">
+<div id="outline-container-org511a639" class="outline-2">
+<h2 id="org511a639">Key Server</h2>
+<div class="outline-text-2" id="text-org511a639">
 <p>
 An OpenPGP key server for storing and retrieving GPG public keys.
 </p>
@@ -478,9 +490,9 @@ An OpenPGP key server for storing and retrieving GPG public keys.
 </p>
 </div>
 </div>
-<div id="outline-container-org471027b" class="outline-2">
-<h2 id="org471027b">Koel</h2>
-<div class="outline-text-2" id="text-org471027b">
+<div id="outline-container-org058add3" class="outline-2">
+<h2 id="org058add3">Koel</h2>
+<div class="outline-text-2" id="text-org058add3">
 <p>
 Access your music collection from any internet connected device.
 </p>
@@ -490,9 +502,9 @@ Access your music collection from any internet connected device.
 </p>
 </div>
 </div>
-<div id="outline-container-org0424b63" class="outline-2">
-<h2 id="org0424b63">Lychee</h2>
-<div class="outline-text-2" id="text-org0424b63">
+<div id="outline-container-org611fc47" class="outline-2">
+<h2 id="org611fc47">Lychee</h2>
+<div class="outline-text-2" id="text-org611fc47">
 <p>
 Make your photo albums available on the web.
 </p>
@@ -502,9 +514,9 @@ Make your photo albums available on the web.
 </p>
 </div>
 </div>
-<div id="outline-container-orga6a88dd" class="outline-2">
-<h2 id="orga6a88dd">Mailpile</h2>
-<div class="outline-text-2" id="text-orga6a88dd">
+<div id="outline-container-org3a59d15" class="outline-2">
+<h2 id="org3a59d15">Mailpile</h2>
+<div class="outline-text-2" id="text-org3a59d15">
 <p>
 Modern email client which supports GPG encryption.
 </p>
@@ -514,9 +526,9 @@ Modern email client which supports GPG encryption.
 </p>
 </div>
 </div>
-<div id="outline-container-org6518c3d" class="outline-2">
-<h2 id="org6518c3d">Matrix</h2>
-<div class="outline-text-2" id="text-org6518c3d">
+<div id="outline-container-org36c7c61" class="outline-2">
+<h2 id="org36c7c61">Matrix</h2>
+<div class="outline-text-2" id="text-org36c7c61">
 <p>
 Multi-user chat with some security and moderation controls.
 </p>
@@ -526,9 +538,9 @@ Multi-user chat with some security and moderation controls.
 </p>
 </div>
 </div>
-<div id="outline-container-org1413e81" class="outline-2">
-<h2 id="org1413e81">Mediagoblin</h2>
-<div class="outline-text-2" id="text-org1413e81">
+<div id="outline-container-org69bd95e" class="outline-2">
+<h2 id="org69bd95e">Mediagoblin</h2>
+<div class="outline-text-2" id="text-org69bd95e">
 <p>
 Publicly host video and audio files so that you don't need to use YouTube/Vimeo/etc.
 </p>
@@ -538,9 +550,9 @@ Publicly host video and audio files so that you don't need to use YouTube/Vimeo/
 </p>
 </div>
 </div>
-<div id="outline-container-orgb8d2738" class="outline-2">
-<h2 id="orgb8d2738">Mumble</h2>
-<div class="outline-text-2" id="text-orgb8d2738">
+<div id="outline-container-org083b086" class="outline-2">
+<h2 id="org083b086">Mumble</h2>
+<div class="outline-text-2" id="text-org083b086">
 <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>
@@ -550,9 +562,9 @@ The popular VoIP and text chat system. Say goodbye to old-fashioned telephony co
 </p>
 </div>
 </div>
-<div id="outline-container-org78d79cd" class="outline-2">
-<h2 id="org78d79cd">NextCloud</h2>
-<div class="outline-text-2" id="text-org78d79cd">
+<div id="outline-container-orga89941d" class="outline-2">
+<h2 id="orga89941d">NextCloud</h2>
+<div class="outline-text-2" id="text-orga89941d">
 <p>
 Store files on your server and sync them with laptops or mobile devices. Includes many plugins including videoconferencing and collaborative document editing.
 </p>
@@ -562,9 +574,9 @@ Store files on your server and sync them with laptops or mobile devices. Include
 </p>
 </div>
 </div>
-<div id="outline-container-org40a7fdc" class="outline-2">
-<h2 id="org40a7fdc">PeerTube</h2>
-<div class="outline-text-2" id="text-org40a7fdc">
+<div id="outline-container-org1855642" class="outline-2">
+<h2 id="org1855642">PeerTube</h2>
+<div class="outline-text-2" id="text-org1855642">
 <p>
 Peer-to-peer video hosting. Similar to Mediagoblin, but the P2P aspect better enables the streaming load to be shared across servers.
 </p>
@@ -574,9 +586,9 @@ Peer-to-peer video hosting. Similar to Mediagoblin, but the P2P aspect better en
 </p>
 </div>
 </div>
-<div id="outline-container-orgfca92a1" class="outline-2">
-<h2 id="orgfca92a1">PI-Hole</h2>
-<div class="outline-text-2" id="text-orgfca92a1">
+<div id="outline-container-org75f549b" class="outline-2">
+<h2 id="org75f549b">PI-Hole</h2>
+<div class="outline-text-2" id="text-org75f549b">
 <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>
@@ -586,9 +598,9 @@ The black hole for web adverts. Block adverts at the domain name level within yo
 </p>
 </div>
 </div>
-<div id="outline-container-org78a2d24" class="outline-2">
-<h2 id="org78a2d24">PostActiv</h2>
-<div class="outline-text-2" id="text-org78a2d24">
+<div id="outline-container-orga1fbb11" class="outline-2">
+<h2 id="orga1fbb11">PostActiv</h2>
+<div class="outline-text-2" id="text-orga1fbb11">
 <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>
@@ -598,9 +610,9 @@ An alternative federated social networking system compatible with GNU Social, Pl
 </p>
 </div>
 </div>
-<div id="outline-container-org233a0fb" class="outline-2">
-<h2 id="org233a0fb">PrivateBin</h2>
-<div class="outline-text-2" id="text-org233a0fb">
+<div id="outline-container-org1448160" class="outline-2">
+<h2 id="org1448160">PrivateBin</h2>
+<div class="outline-text-2" id="text-org1448160">
 <p>
 A pastebin where the server has zero knowledge of the content being pasted.
 </p>
@@ -610,9 +622,9 @@ A pastebin where the server has zero knowledge of the content being pasted.
 </p>
 </div>
 </div>
-<div id="outline-container-org70bfbdf" class="outline-2">
-<h2 id="org70bfbdf">Profanity</h2>
-<div class="outline-text-2" id="text-org70bfbdf">
+<div id="outline-container-org9d310cf" class="outline-2">
+<h2 id="org9d310cf">Profanity</h2>
+<div class="outline-text-2" id="text-org9d310cf">
 <p>
 A shell based XMPP client which you can run on the Freedombone server via ssh.
 </p>
@@ -622,9 +634,9 @@ A shell based XMPP client which you can run on the Freedombone server via ssh.
 </p>
 </div>
 </div>
-<div id="outline-container-org3e596b4" class="outline-2">
-<h2 id="org3e596b4">Riot Web</h2>
-<div class="outline-text-2" id="text-org3e596b4">
+<div id="outline-container-orge6aa619" class="outline-2">
+<h2 id="orge6aa619">Riot Web</h2>
+<div class="outline-text-2" id="text-orge6aa619">
 <p>
 A browser based user interface for the Matrix federated communications system, including WebRTC audio and video chat.
 </p>
@@ -634,9 +646,9 @@ A browser based user interface for the Matrix federated communications system, i
 </p>
 </div>
 </div>
-<div id="outline-container-org19a30bc" class="outline-2">
-<h2 id="org19a30bc">SearX</h2>
-<div class="outline-text-2" id="text-org19a30bc">
+<div id="outline-container-org50e63cb" class="outline-2">
+<h2 id="org50e63cb">SearX</h2>
+<div class="outline-text-2" id="text-org50e63cb">
 <p>
 A metasearch engine for customised and private web searches.
 </p>
@@ -646,9 +658,9 @@ A metasearch engine for customised and private web searches.
 </p>
 </div>
 </div>
-<div id="outline-container-orgfdae631" class="outline-2">
-<h2 id="orgfdae631">tt-rss</h2>
-<div class="outline-text-2" id="text-orgfdae631">
+<div id="outline-container-orgec6ad33" class="outline-2">
+<h2 id="orgec6ad33">tt-rss</h2>
+<div class="outline-text-2" id="text-orgec6ad33">
 <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>
@@ -658,9 +670,9 @@ Private RSS reader. Pulls in RSS/Atom feeds via Tor and is only accessible via a
 </p>
 </div>
 </div>
-<div id="outline-container-org6c1fb9a" class="outline-2">
-<h2 id="org6c1fb9a">Syncthing</h2>
-<div class="outline-text-2" id="text-org6c1fb9a">
+<div id="outline-container-org4de6eec" class="outline-2">
+<h2 id="org4de6eec">Syncthing</h2>
+<div class="outline-text-2" id="text-org4de6eec">
 <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>
@@ -670,9 +682,9 @@ Possibly the best way to synchronise files across all of your devices. Once it h
 </p>
 </div>
 </div>
-<div id="outline-container-org313c9b7" class="outline-2">
-<h2 id="org313c9b7">Tahoe-LAFS</h2>
-<div class="outline-text-2" id="text-org313c9b7">
+<div id="outline-container-orgebbf48a" class="outline-2">
+<h2 id="orgebbf48a">Tahoe-LAFS</h2>
+<div class="outline-text-2" id="text-orgebbf48a">
 <p>
 Robust and encrypted storage of files on one or more server.
 </p>
@@ -682,9 +694,9 @@ Robust and encrypted storage of files on one or more server.
 </p>
 </div>
 </div>
-<div id="outline-container-org74af2ab" class="outline-2">
-<h2 id="org74af2ab">Tox</h2>
-<div class="outline-text-2" id="text-org74af2ab">
+<div id="outline-container-org3275ee7" class="outline-2">
+<h2 id="org3275ee7">Tox</h2>
+<div class="outline-text-2" id="text-org3275ee7">
 <p>
 Client and bootstrap node for the Tox chat/VoIP system.
 </p>
@@ -694,9 +706,9 @@ Client and bootstrap node for the Tox chat/VoIP system.
 </p>
 </div>
 </div>
-<div id="outline-container-org5d5986e" class="outline-2">
-<h2 id="org5d5986e">Turtl</h2>
-<div class="outline-text-2" id="text-org5d5986e">
+<div id="outline-container-orgceb6c24" class="outline-2">
+<h2 id="orgceb6c24">Turtl</h2>
+<div class="outline-text-2" id="text-orgceb6c24">
 <p>
 A system for privately creating and sharing notes and images, similar to Evernote but without the spying.
 </p>
@@ -706,18 +718,18 @@ A system for privately creating and sharing notes and images, similar to Evernot
 </p>
 </div>
 </div>
-<div id="outline-container-org2b614c0" class="outline-2">
-<h2 id="org2b614c0">Vim</h2>
-<div class="outline-text-2" id="text-org2b614c0">
+<div id="outline-container-org1216de4" class="outline-2">
+<h2 id="org1216de4">Vim</h2>
+<div class="outline-text-2" id="text-org1216de4">
 <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-orgdb6427c" class="outline-2">
-<h2 id="orgdb6427c">Virtual Private Network (VPN)</h2>
-<div class="outline-text-2" id="text-orgdb6427c">
+<div id="outline-container-org057b184" class="outline-2">
+<h2 id="org057b184">Virtual Private Network (VPN)</h2>
+<div class="outline-text-2" id="text-org057b184">
 <p>
 Set up a VPN on your server so that you can bypass local internet censorship.
 </p>
@@ -727,9 +739,9 @@ Set up a VPN on your server so that you can bypass local internet censorship.
 </p>
 </div>
 </div>
-<div id="outline-container-org15bc23b" class="outline-2">
-<h2 id="org15bc23b">XMPP</h2>
-<div class="outline-text-2" id="text-org15bc23b">
+<div id="outline-container-org93a66a0" class="outline-2">
+<h2 id="org93a66a0">XMPP</h2>
+<div class="outline-text-2" id="text-org93a66a0">
 <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>