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

doc/EN/app_smolrss.org

@@ -0,0 +1,29 @@
+#+TITLE:
+#+AUTHOR: Bob Mottram
+#+EMAIL: bob@freedombone.net
+#+KEYWORDS: freedombone, smolrss, rss
+#+DESCRIPTION: How to use Smol RSS
+#+OPTIONS: ^:nil toc:nil
+#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="freedombone.css" />
+
+#+attr_html: :width 80% :height 10% :align center
+[[file:images/logo.png]]
+
+* Smol RSS
+This is an extremely simple RSS reader which is available only from an onion address, so that you have /the right to read/. There is very little code and so not much attack surface, and it will scale to screens of any size. This should be a better reading experience on mobile than with [[./app_ttrss.html][tt-rss]].
+
+A disadvantage is that you can only add or remove feeds via the Freedombone administrator control panel, so this isn't suitable for multi-user environments. But once you have your feeds set up it's trivial to use, and unless you publish the onion address confidentiality should be maintained.
+
+* Installation
+
+ssh into the system with:
+
+#+BEGIN_SRC bash
+ssh myusername@mydomain.com -p 2222
+#+END_SRC
+
+Select *Administrator controls* then *Add/Remove Apps* then *smolrss*.
+
+After installation within *Administrator controls* go to *App settings* then *smolrss*. You can then add some feeds or edit the existing feed list. There are a few default feeds as an example.
+
+Within *Administrator controls* go to *About this system* and select *smolrss*. You will then have the onion address. Navigate to your reader in a Tor compatible browser. You may need to allow the site within NoScript. Then select a feed from the list and begin reading. That's all there is to it.

doc/EN/apps.org

@@ -163,14 +163,18 @@ A non-federated chat server (x86 systems only).
 A metasearch engine for customised and private web searches.
 
 [[./app_searx.html][How to use it]]
-* tt-rss
-Private RSS reader. Pulls in RSS/Atom feeds via Tor and is only accessible via an onion address. Have "/the right to read/" 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.
+* Smol RSS
+A very minimal RSS reader.
 
-[[./app_rss.html][How to use it]]
+[[./app_smolrss.html][How to use it]]
 * Syncthing
 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.
 
 [[./app_syncthing.html][How to use it]]
+* tt-rss
+Private RSS reader. Pulls in RSS/Atom feeds via Tor and is only accessible via an onion address. Have "/the right to read/" 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.
+
+[[./app_rss.html][How to use it]]
 * Tahoe-LAFS
 Robust and encrypted storage of files on one or more server.
 

src/freedombone-app-matrix

@@ -48,7 +48,7 @@ MATRIX_PORT=8009
 MATRIX_FEDERATION_ONION_PORT=8111
 MATRIX_ONION_PORT=8109
 MATRIX_REPO="https://github.com/matrix-org/synapse"
-MATRIX_COMMIT='ddb00efc1ddec646d02e8def6053003f04d077d7'
+MATRIX_COMMIT='ab5e888927e6a38190a65e10af7acf67873124e3'
 REPORT_STATS="no"
 MATRIX_SECRET=
 MATRIX_EXPIRE_MONTHS=1

src/freedombone-app-pleroma

@@ -36,7 +36,7 @@ PLEROMA_CODE=
 PLEROMA_PORT=4000
 PLEROMA_ONION_PORT=8011
 PLEROMA_REPO="https://git.pleroma.social/pleroma/pleroma.git"
-PLEROMA_COMMIT='762f6edc29a7a48e3a663e9bedec58e0036ff363'
+PLEROMA_COMMIT='1d4bbec6b3239bb83b500a6a90e6686cb682cfac'
 PLEROMA_ADMIN_PASSWORD=
 PLEROMA_DIR=/etc/pleroma
 PLEROMA_SECRET_KEY=""

src/freedombone-app-smolrss

@@ -0,0 +1,409 @@
+#!/bin/bash
+#
+#  _____               _           _
+# |   __|___ ___ ___ _| |___ _____| |_ ___ ___ ___
+# |   __|  _| -_| -_| . | . |     | . | . |   | -_|
+# |__|  |_| |___|___|___|___|_|_|_|___|___|_|_|___|
+#
+#                              Freedom in the Cloud
+#
+# 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'
+
+IN_DEFAULT_INSTALL=0
+SHOW_ON_ABOUT=1
+SHOW_ICANN_ADDRESS_ON_ABOUT=0
+
+SMOLRSS_DOMAIN_NAME=
+SMOLRSS_CODE=
+SMOLRSS_ONION_PORT=8751
+SMOLRSS_REPO="https://github.com/bashrc/smolrss"
+SMOLRSS_COMMIT='d9fca3fd76b95c601553a1264ff500c287211105'
+
+smolrss_variables=(ONION_ONLY
+                   SMOLRSS_DOMAIN_NAME
+                   SMOLRSS_CODE
+                   DDNS_PROVIDER
+                   MY_USERNAME)
+
+function logging_on_smolrss {
+    echo -n ''
+}
+
+function logging_off_smolrss {
+    echo -n ''
+}
+
+function remove_user_smolrss {
+    #remove_username="$1"
+    echo -n ''
+}
+
+function add_user_smolrss {
+    #new_username="$1"
+    #new_user_password="$2"
+
+    echo '0'
+}
+
+function install_interactive_smolrss {
+    echo -n ''
+    APP_INSTALLED=1
+}
+
+function change_password_smolrss {
+    #curr_username="$1"
+    #new_user_password="$2"
+    echo -n ''
+}
+
+function reconfigure_smolrss {
+    # This is used if you need to switch identity. Dump old keys and generate new ones
+    echo -n ''
+}
+
+function smolrss_add_feed {
+    data=$(mktemp 2>/dev/null)
+    dialog --backtitle $"Smol RSS" \
+           --title $"Add an RSS feed" \
+           --form "\\n" 8 60 3 \
+           $"Title:" 1 1 "" 1 12 40 256 \
+           $"Feed URL:" 2 1 "" 2 12 40 10000 \
+           2> "$data"
+    sel=$?
+    case $sel in
+        1) rm -f "$data"
+           return;;
+        255) rm -f "$data"
+             return;;
+    esac
+    title=$(sed -n 1p < "$data")
+    url=$(sed -n 2p < "$data")
+    rm -f "$data"
+
+    if [ ! "$title" ]; then
+        return
+    fi
+
+    if [ ! "$url" ]; then
+        return
+    fi
+
+    if [[ "$url" == *','* ]]; then
+        return
+    fi
+    if [[ "$url" != *'.'* ]]; then
+        return
+    fi
+
+    cd "/var/www/$SMOLRSS_DOMAIN_NAME/htdocs" || return
+
+    if grep -q "${title}," feeds.txt; then
+        sed -i "s|${title},.*|${title},${url}|g" feeds.txt
+    else
+        echo "${title},${url}" >> feeds.txt
+    fi
+
+    ./create_feeds feeds.txt > feeds.xml
+    chown www-data:www-data feeds.txt
+
+    dialog --title $"Add an RSS feed" \
+           --msgbox $"${title} has been added" 6 70
+}
+
+function smolrss_remove_feed {
+    data=$(mktemp 2>/dev/null)
+    dialog --title $"Remove an RSS feed" \
+           --backtitle $"Smol RSS" \
+           --inputbox $"Enter the title of the feed to remove" 8 60 2>"$data"
+    sel=$?
+    case $sel in
+        0)
+            title=$(<"$data")
+            if [ "$title" ]; then
+                cd "/var/www/$SMOLRSS_DOMAIN_NAME/htdocs" || return
+                if grep -q "${title}," feeds.txt; then
+                    sed -i "/${title},/d" feeds.xml
+                    ./create_feeds feeds.txt > feeds.xml
+                    chown www-data:www-data feeds.txt
+                    dialog --title $"Remove an RSS feed" \
+                           --msgbox $"${title} has been removed" 6 70
+                fi
+            fi
+            ;;
+    esac
+    rm -f "$data"
+}
+
+function configure_interactive_smolrss {
+    W=(1 $"Add an RSS feed"
+       2 $"Remove an RSS feed"
+       3 $'Edit all feeds'
+       4 $'Light theme'
+       5 $'Dark theme')
+
+    read_config_param SMOLRSS_DOMAIN_NAME
+
+    while true
+    do
+
+        # shellcheck disable=SC2068
+        selection=$(dialog --backtitle $"Freedombone Administrator Control Panel" --title $"Smol RSS" --menu $"Choose an operation, or ESC for main menu:" 14 70 5 "${W[@]}" 3>&2 2>&1 1>&3)
+
+        if [ ! "$selection" ]; then
+            break
+        fi
+        case $selection in
+            1) smolrss_add_feed
+               ;;
+            2) smolrss_remove_feed
+               ;;
+            3) editor "/var/www/$SMOLRSS_DOMAIN_NAME/htdocs/feeds.txt"
+               cd "/var/www/$SMOLRSS_DOMAIN_NAME/htdocs" || break
+               ./create_feeds feeds.txt > feeds.xml
+               chown www-data:www-data feeds.txt
+               ;;
+            4) cd "/var/www/$SMOLRSS_DOMAIN_NAME/htdocs" || break
+               cp style.light.css style.css
+               chown www-data:www-data style.css
+               dialog --title $"Smol RSS theme" \
+                      --msgbox $"Switched theme to light" 6 50
+               ;;
+            5) cd "/var/www/$SMOLRSS_DOMAIN_NAME/htdocs" || break
+               cp style.dark.css style.css
+               chown www-data:www-data style.css
+               dialog --title $"Smol RSS theme" \
+                      --msgbox $"Switched theme to dark" 6 50
+               ;;
+        esac
+    done
+}
+
+function upgrade_smolrss {
+    CURR_SMOLRSS_COMMIT=$(get_completion_param "smolrss commit")
+    if [[ "$CURR_SMOLRSS_COMMIT" == "$SMOLRSS_COMMIT" ]]; then
+        return
+    fi
+
+    if grep -q "smolrss domain" "$COMPLETION_FILE"; then
+        SMOLRSS_DOMAIN_NAME=$(get_completion_param "smolrss domain")
+    fi
+
+    # update to the next commit
+    set_repo_commit "/var/www/$SMOLRSS_DOMAIN_NAME/htdocs" "smolrss commit" "$SMOLRSS_COMMIT" "$SMOLRSS_REPO"
+
+    cd "/var/www/$SMOLRSS_DOMAIN_NAME/htdocs" || return
+    ./create_feeds feeds.txt > feeds.xml
+
+    chown -R www-data:www-data "/var/www/${SMOLRSS_DOMAIN_NAME}/htdocs"
+}
+
+function backup_local_smolrss {
+    SMOLRSS_DOMAIN_NAME='smolrss'
+    if grep -q "smolrss domain" "$COMPLETION_FILE"; then
+        SMOLRSS_DOMAIN_NAME=$(get_completion_param "smolrss domain")
+    fi
+
+    source_directory=/var/www/${SMOLRSS_DOMAIN_NAME}/htdocs
+
+    suspend_site "${SMOLRSS_DOMAIN_NAME}"
+
+    dest_directory=smolrss
+    backup_directory_to_usb "$source_directory" $dest_directory
+
+    restart_site
+}
+
+function restore_local_smolrss {
+    if ! grep -q "smolrss domain" "$COMPLETION_FILE"; then
+        return
+    fi
+    SMOLRSS_DOMAIN_NAME=$(get_completion_param "smolrss domain")
+    if [ ! "$SMOLRSS_DOMAIN_NAME" ]; then
+        return
+    fi
+    suspend_site "${SMOLRSS_DOMAIN_NAME}"
+    temp_restore_dir=/root/tempsmolrss
+    smolrss_dir=/var/www/${SMOLRSS_DOMAIN_NAME}/htdocs
+
+    restore_directory_from_usb $temp_restore_dir smolrss
+    if [ -d $temp_restore_dir ]; then
+        if [ -d "$temp_restore_dir$smolrss_dir" ]; then
+            cp -rp "$temp_restore_dir$smolrss_dir"/* "$smolrss_dir"/
+        else
+            if [ ! -d "$smolrss_dir" ]; then
+                mkdir "$smolrss_dir"
+            fi
+            cp -rp "$temp_restore_dir"/* "$smolrss_dir"/
+        fi
+        chown -R www-data:www-data "$smolrss_dir"
+        rm -rf $temp_restore_dir
+    fi
+    restart_site
+}
+
+function backup_remote_smolrss {
+    SMOLRSS_DOMAIN_NAME='smolrss'
+    if grep -q "smolrss domain" "$COMPLETION_FILE"; then
+        SMOLRSS_DOMAIN_NAME=$(get_completion_param "smolrss domain")
+    fi
+
+    source_directory=/var/www/${SMOLRSS_DOMAIN_NAME}/htdocs
+
+    suspend_site "${SMOLRSS_DOMAIN_NAME}"
+
+    dest_directory=smolrss
+    backup_directory_to_friend "$source_directory" $dest_directory
+
+    restart_site
+}
+
+function restore_remote_smolrss {
+    if ! grep -q "smolrss domain" "$COMPLETION_FILE"; then
+        return
+    fi
+    SMOLRSS_DOMAIN_NAME=$(get_completion_param "smolrss domain")
+    if [ ! "$SMOLRSS_DOMAIN_NAME" ]; then
+        return
+    fi
+    suspend_site "${SMOLRSS_DOMAIN_NAME}"
+    temp_restore_dir=/root/tempsmolrss
+    smolrss_dir=/var/www/${SMOLRSS_DOMAIN_NAME}/htdocs
+
+    restore_directory_from_friend $temp_restore_dir smolrss
+    if [ -d $temp_restore_dir ]; then
+        if [ -d "$temp_restore_dir$smolrss_dir" ]; then
+            cp -rp "$temp_restore_dir$smolrss_dir"/* "$smolrss_dir"/
+        else
+            if [ ! -d "$smolrss_dir" ]; then
+                mkdir "$smolrss_dir"
+            fi
+            cp -rp $temp_restore_dir/* "$smolrss_dir"/
+        fi
+        chown -R www-data:www-data "$smolrss_dir"
+        rm -rf $temp_restore_dir
+    fi
+    restart_site
+}
+
+function remove_smolrss {
+    nginx_dissite "$SMOLRSS_DOMAIN_NAME"
+    remove_certs "$SMOLRSS_DOMAIN_NAME"
+
+
+    if [ -d "/var/www/$SMOLRSS_DOMAIN_NAME" ]; then
+        rm -rf "/var/www/$SMOLRSS_DOMAIN_NAME"
+    fi
+    if [ -f "/etc/nginx/sites-available/$SMOLRSS_DOMAIN_NAME" ]; then
+        rm "/etc/nginx/sites-available/$SMOLRSS_DOMAIN_NAME"
+    fi
+    remove_onion_service smolrss "${SMOLRSS_ONION_PORT}"
+    if grep -q "smolrss" /etc/crontab; then
+        sed -i "/smolrss/d" /etc/crontab
+    fi
+    remove_app smolrss
+    remove_completion_param install_smolrss
+    sed -i '/smolrss/d' "$COMPLETION_FILE"
+
+    remove_ddns_domain "$SMOLRSS_DOMAIN_NAME"
+}
+
+function install_smolrss {
+    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
+
+    SMOLRSS_DOMAIN_NAME='smolrss.local'
+
+    if [ -d "/var/www/$SMOLRSS_DOMAIN_NAME/htdocs" ]; then
+        rm -rf "/var/www/$SMOLRSS_DOMAIN_NAME/htdocs"
+    fi
+    if [ -d /repos/smolrss ]; then
+        mkdir "/var/www/$SMOLRSS_DOMAIN_NAME/htdocs"
+        cp -r -p /repos/smolrss/. "/var/www/$SMOLRSS_DOMAIN_NAME/htdocs"
+        cd "/var/www/$SMOLRSS_DOMAIN_NAME/htdocs" || exit 324687356
+        git pull
+    else
+        git_clone "$SMOLRSS_REPO" "/var/www/$SMOLRSS_DOMAIN_NAME/htdocs"
+    fi
+
+    if [ ! -d "/var/www/$SMOLRSS_DOMAIN_NAME/htdocs" ]; then
+        echo $'Unable to clone smolrss repo'
+        exit 87525
+    fi
+
+    cd "/var/www/$SMOLRSS_DOMAIN_NAME/htdocs" || exit 36587356
+    git checkout "$SMOLRSS_COMMIT" -b "$SMOLRSS_COMMIT"
+    set_completion_param "smolrss commit" "$SMOLRSS_COMMIT"
+
+    cp feeds.example.txt feeds.txt
+    ./create_feeds feeds.txt > feeds.xml
+
+    chmod g+w "/var/www/$SMOLRSS_DOMAIN_NAME/htdocs"
+    chown -R www-data:www-data "/var/www/$SMOLRSS_DOMAIN_NAME/htdocs"
+
+    add_ddns_domain "$SMOLRSS_DOMAIN_NAME"
+
+    SMOLRSS_ONION_HOSTNAME=$(add_onion_service smolrss 80 "${SMOLRSS_ONION_PORT}")
+
+    smolrss_nginx_site=/etc/nginx/sites-available/$SMOLRSS_DOMAIN_NAME
+    echo -n '' > "$smolrss_nginx_site"
+    { echo 'server {';
+      echo "    listen 127.0.0.1:$SMOLRSS_ONION_PORT default_server;";
+      echo "    server_name $SMOLRSS_ONION_HOSTNAME;";
+      echo ''; } >> "$smolrss_nginx_site"
+    nginx_compress "$SMOLRSS_DOMAIN_NAME"
+    echo '' >> "$smolrss_nginx_site"
+    nginx_security_options "$SMOLRSS_DOMAIN_NAME"
+    { echo '';
+      echo '    access_log /dev/null;';
+      echo '    error_log /dev/null;';
+      echo '';
+      echo "    root /var/www/$SMOLRSS_DOMAIN_NAME/htdocs;";
+      echo '';
+      echo '  index index.php;';
+      echo '  location ~ \.php {';
+      echo '    include snippets/fastcgi-php.conf;';
+      echo '    fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;';
+      echo '    fastcgi_read_timeout 30;';
+      echo '    fastcgi_param HTTPS off;';
+      echo '  }';
+      echo '';
+      echo '  # Location';
+      echo '  location / {'; } >> "$smolrss_nginx_site"
+    nginx_limits "$SMOLRSS_DOMAIN_NAME" '15m'
+    { echo "    try_files \$uri \$uri/ index.php?\$args;";
+      echo '  }';
+      echo '}'; } >> "$smolrss_nginx_site"
+
+    configure_php
+
+    nginx_ensite "$SMOLRSS_DOMAIN_NAME"
+
+    systemctl restart php7.0-fpm
+
+    systemctl restart nginx
+
+    "${PROJECT_NAME}-pass" -u "$MY_USERNAME" -a smolrss -p "$SMOLRSS_ADMIN_PASSWORD"
+    set_completion_param "smolrss domain" "$SMOLRSS_DOMAIN_NAME"
+
+    APP_INSTALLED=1
+}
+
+# NOTE: deliberately there is no "exit 0"

src/freedombone-app-xmpp

@@ -644,7 +644,6 @@ function remove_xmpp {
 
     function_check remove_onion_service
     remove_onion_service xmpp 5222 5223 5269
-    sed -i '/HiddenServiceVersion 2/d' "$ONION_SERVICES_FILE"
 
     apt-mark -q unhold prosody
     apt-get -yq remove --purge prosody
@@ -1133,7 +1132,7 @@ function install_xmpp {
     fi
     if ! grep -q "hidden_service_xmpp" "$ONION_SERVICES_FILE"; then
         { echo 'HiddenServiceDir /var/lib/tor/hidden_service_xmpp/';
-          echo 'HiddenServiceVersion 2';
+          echo 'HiddenServiceVersion 3';
           echo "HiddenServicePort 5222 127.0.0.1:5222";
           echo "HiddenServicePort 5269 127.0.0.1:5269"; } >> "$ONION_SERVICES_FILE"
         echo $'Added onion site for xmpp chat'

src/freedombone-image-customise

@@ -1997,6 +1997,7 @@ image_preinstall_repos() {
     git clone "$PRIVATEBIN_REPO" "$rootdir/repos/privatebin"
     git clone "$EDITH_REPO" "$rootdir/repos/edith"
     git clone "$BDSMAIL_REPO" "$rootdir/repos/bdsmail"
+    git clone "$SMOLRSS_REPO" "$rootdir/repos/smolrss"
     #git clone "$WEKAN_REPO" "$rootdir/repos/wekan"
     #git clone "$FLOW_ROUTER_REPO" "$rootdir/repos/flowrouter"
     #git clone "$ZERONET_REPO" "$rootdir/repos/zeronet"

src/freedombone-template

@@ -344,22 +344,22 @@ echo '}'
 if [[ "$database_type" == "mariadb" || "$database_type" == "mysql" || "$database_type" == "postgres"* || "$database_type" == "mongo"* ]]; then
     echo ''
     echo "function ${app_name}_create_database {"
-    echo "    if [ -f \$IMAGE_PASSWORD_FILE ]; then"
+    echo "    if [ -f \"\$IMAGE_PASSWORD_FILE\" ]; then"
     echo "        ${app_name_upper}_ADMIN_PASSWORD=\"\$(printf \"%d\" \"\$(cat \"$IMAGE_PASSWORD_FILE\")\")\""
     echo '    else'
-    echo "        if [ ! \$${app_name_upper}_ADMIN_PASSWORD ]; then"
-    echo "            ${app_name_upper}_ADMIN_PASSWORD=\"\$(create_password \${MINIMUM_PASSWORD_LENGTH})\""
+    echo "        if [ ! \"\$${app_name_upper}_ADMIN_PASSWORD\" ]; then"
+    echo "            ${app_name_upper}_ADMIN_PASSWORD=\$(create_password \"\${MINIMUM_PASSWORD_LENGTH}\")"
     echo '        fi'
     echo '    fi'
-    echo "    if [ ! \$${app_name_upper}_ADMIN_PASSWORD ]; then"
+    echo "    if [ ! \"\$${app_name_upper}_ADMIN_PASSWORD\" ]; then"
     echo '        return'
     echo '    fi'
     echo ''
     if [[ "$database_type" = "mysql" || "$database_type" = "mariadb" ]]; then
-        echo "    create_database ${app_name} \"\$${app_name_upper}_ADMIN_PASSWORD\" \$MY_USERNAME"
+        echo "    create_database ${app_name} \"\$${app_name_upper}_ADMIN_PASSWORD\" \"\$MY_USERNAME\""
     fi
     if [[ "$database_type" = "mongo"* ]]; then
-        echo "    create_database_mongodb ${app_name} \"\$${app_name_upper}_ADMIN_PASSWORD\" \$MY_USERNAME"
+        echo "    create_database_mongodb ${app_name} \"\$${app_name_upper}_ADMIN_PASSWORD\" \"\$MY_USERNAME\""
     fi
     if [[ "$database_type" == "postgres"* ]]; then
         echo '    systemctl restart postgresql'
@@ -1002,8 +1002,10 @@ if [ $app_daemon ]; then
     echo "    systemctl start ${app_name}"
 fi
 if [ $app_webui ]; then
-    echo ''
-    echo "    create_site_certificate \"\$${app_name_upper}_DOMAIN_NAME\" 'yes'"
+    if [ ! $app_onion_only ]; then
+        echo ''
+        echo "    create_site_certificate \"\$${app_name_upper}_DOMAIN_NAME\" 'yes'"
+    fi
     echo ''
     echo "    nginx_ensite \"\$${app_name_upper}_DOMAIN_NAME\""
 fi

website/EN/app_smolrss.html

@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+<title></title>
+<!-- 2018-05-19 Sat 23:12 -->
+<meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta  name="generator" content="Org-mode" />
+<meta  name="author" content="Bob Mottram" />
+<meta  name="description" content="How to use Smol RSS"
+ />
+<meta  name="keywords" content="freedombone, smolrss, rss" />
+<style type="text/css">
+ <!--/*--><![CDATA[/*><!--*/
+  .title  { text-align: center; }
+  .todo   { font-family: monospace; color: red; }
+  .done   { color: green; }
+  .tag    { background-color: #eee; font-family: monospace;
+            padding: 2px; font-size: 80%; font-weight: normal; }
+  .timestamp { color: #bebebe; }
+  .timestamp-kwd { color: #5f9ea0; }
+  .right  { margin-left: auto; margin-right: 0px;  text-align: right; }
+  .left   { margin-left: 0px;  margin-right: auto; text-align: left; }
+  .center { margin-left: auto; margin-right: auto; text-align: center; }
+  .underline { text-decoration: underline; }
+  #postamble p, #preamble p { font-size: 90%; margin: .2em; }
+  p.verse { margin-left: 3%; }
+  pre {
+    border: 1px solid #ccc;
+    box-shadow: 3px 3px 3px #eee;
+    padding: 8pt;
+    font-family: monospace;
+    overflow: auto;
+    margin: 1.2em;
+  }
+  pre.src {
+    position: relative;
+    overflow: visible;
+    padding-top: 1.2em;
+  }
+  pre.src:before {
+    display: none;
+    position: absolute;
+    background-color: white;
+    top: -10px;
+    right: 10px;
+    padding: 3px;
+    border: 1px solid black;
+  }
+  pre.src:hover:before { display: inline;}
+  pre.src-sh:before    { content: 'sh'; }
+  pre.src-bash:before  { content: 'sh'; }
+  pre.src-emacs-lisp:before { content: 'Emacs Lisp'; }
+  pre.src-R:before     { content: 'R'; }
+  pre.src-perl:before  { content: 'Perl'; }
+  pre.src-java:before  { content: 'Java'; }
+  pre.src-sql:before   { content: 'SQL'; }
+
+  table { border-collapse:collapse; }
+  caption.t-above { caption-side: top; }
+  caption.t-bottom { caption-side: bottom; }
+  td, th { vertical-align:top;  }
+  th.right  { text-align: center;  }
+  th.left   { text-align: center;   }
+  th.center { text-align: center; }
+  td.right  { text-align: right;  }
+  td.left   { text-align: left;   }
+  td.center { text-align: center; }
+  dt { font-weight: bold; }
+  .footpara:nth-child(2) { display: inline; }
+  .footpara { display: block; }
+  .footdef  { margin-bottom: 1em; }
+  .figure { padding: 1em; }
+  .figure p { text-align: center; }
+  .inlinetask {
+    padding: 10px;
+    border: 2px solid gray;
+    margin: 10px;
+    background: #ffffcc;
+  }
+  #org-div-home-and-up
+   { text-align: right; font-size: 70%; white-space: nowrap; }
+  textarea { overflow-x: auto; }
+  .linenr { font-size: smaller }
+  .code-highlighted { background-color: #ffff00; }
+  .org-info-js_info-navigation { border-style: none; }
+  #org-info-js_console-label
+    { font-size: 10px; font-weight: bold; white-space: nowrap; }
+  .org-info-js_search-highlight
+    { background-color: #ffff00; color: #000000; font-weight: bold; }
+  /*]]>*/-->
+</style>
+<link rel="stylesheet" type="text/css" href="freedombone.css" />
+<script type="text/javascript">
+/*
+@licstart  The following is the entire license notice for the
+JavaScript code in this tag.
+
+Copyright (C) 2012-2013 Free Software Foundation, Inc.
+
+The JavaScript code in this tag is free software: you can
+redistribute it and/or modify it under the terms of the GNU
+General Public License (GNU GPL) as published by the Free Software
+Foundation, either version 3 of the License, or (at your option)
+any later version.  The code is distributed WITHOUT ANY WARRANTY;
+without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
+
+As additional permission under GNU GPL version 3 section 7, you
+may distribute non-source (e.g., minimized or compacted) forms of
+that code without the copy of the GNU GPL normally required by
+section 4, provided you include this license notice and a URL
+through which recipients can access the Corresponding Source.
+
+
+@licend  The above is the entire license notice
+for the JavaScript code in this tag.
+*/
+<!--/*--><![CDATA[/*><!--*/
+ function CodeHighlightOn(elem, id)
+ {
+   var target = document.getElementById(id);
+   if(null != target) {
+     elem.cacheClassElem = elem.className;
+     elem.cacheClassTarget = target.className;
+     target.className = "code-highlighted";
+     elem.className   = "code-highlighted";
+   }
+ }
+ function CodeHighlightOff(elem, id)
+ {
+   var target = document.getElementById(id);
+   if(elem.cacheClassElem)
+     elem.className = elem.cacheClassElem;
+   if(elem.cacheClassTarget)
+     target.className = elem.cacheClassTarget;
+ }
+/*]]>*///-->
+</script>
+</head>
+<body>
+<div id="preamble" class="status">
+<a name="top" id="top"></a>
+</div>
+<div id="content">
+<h1 class="title"></h1>
+
+<div class="figure">
+<p><img src="images/logo.png" alt="logo.png" width="80%" height="10%" align="center" />
+</p>
+</div>
+
+<div id="outline-container-sec-1" class="outline-2">
+<h2 id="sec-1">Smol RSS</h2>
+<div class="outline-text-2" id="text-1">
+<p>
+This is an extremely simple RSS reader which is available only from an onion address, so that you have <i>the right to read</i>. There is very little code and so not much attack surface, and it will scale to screens of any size. This should be a better reading experience on mobile than with <a href="./app_ttrss.html">tt-rss</a>.
+</p>
+
+<p>
+A disadvantage is that you can only add or remove feeds via the Freedombone administrator control panel, so this isn't suitable for multi-user environments. But once you have your feeds set up it's trivial to use, and unless you publish the onion address confidentiality should be maintained.
+</p>
+</div>
+</div>
+
+<div id="outline-container-sec-2" class="outline-2">
+<h2 id="sec-2">Installation</h2>
+<div class="outline-text-2" id="text-2">
+<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>Add/Remove Apps</b> then <b>smolrss</b>.
+</p>
+
+<p>
+After installation within <b>Administrator controls</b> go to <b>App settings</b> then <b>smolrss</b>. You can then add some feeds or edit the existing feed list. There are a few default feeds as an example.
+</p>
+
+<p>
+Within <b>Administrator controls</b> go to <b>About this system</b> and select <b>smolrss</b>. You will then have the onion address. Navigate to your reader in a Tor compatible browser. You may need to allow the site within NoScript. Then select a feed from the list and begin reading. That's all there is to it.
+</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,33 +3,26 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2018-05-16 Wed 15: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>
-<meta name="generator" content="Org mode" />
-<meta name="author" content="Bob Mottram" />
-<meta name="description" content="List of apps available on freedombone"
+<title></title>
+<!-- 2018-05-19 Sat 23:02 -->
+<meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta  name="generator" content="Org-mode" />
+<meta  name="author" content="Bob Mottram" />
+<meta  name="description" content="List of apps available on freedombone"
  />
-<meta name="keywords" content="freedombone, apps" />
+<meta  name="keywords" content="freedombone, apps" />
 <style type="text/css">
  <!--/*--><![CDATA[/*><!--*/
-  .title  { text-align: center;
-             margin-bottom: .2em; }
-  .subtitle { text-align: center;
-              font-size: medium;
-              font-weight: bold;
-              margin-top:0; }
+  .title  { text-align: center; }
   .todo   { font-family: monospace; color: red; }
-  .done   { font-family: monospace; color: green; }
-  .priority { font-family: monospace; color: orange; }
+  .done   { color: green; }
   .tag    { background-color: #eee; font-family: monospace;
             padding: 2px; font-size: 80%; font-weight: normal; }
   .timestamp { color: #bebebe; }
   .timestamp-kwd { color: #5f9ea0; }
-  .org-right  { margin-left: auto; margin-right: 0px;  text-align: right; }
-  .org-left   { margin-left: 0px;  margin-right: auto; text-align: left; }
-  .org-center { margin-left: auto; margin-right: auto; text-align: center; }
+  .right  { margin-left: auto; margin-right: 0px;  text-align: right; }
+  .left   { margin-left: 0px;  margin-right: auto; text-align: left; }
+  .center { margin-left: auto; margin-right: auto; text-align: center; }
   .underline { text-decoration: underline; }
   #postamble p, #preamble p { font-size: 90%; margin: .2em; }
   p.verse { margin-left: 3%; }
@@ -56,111 +49,27 @@
     border: 1px solid black;
   }
   pre.src:hover:before { display: inline;}
-  /* Languages per Org manual */
-  pre.src-asymptote:before { content: 'Asymptote'; }
-  pre.src-awk:before { content: 'Awk'; }
-  pre.src-C:before { content: 'C'; }
-  /* pre.src-C++ doesn't work in CSS */
-  pre.src-clojure:before { content: 'Clojure'; }
-  pre.src-css:before { content: 'CSS'; }
-  pre.src-D:before { content: 'D'; }
-  pre.src-ditaa:before { content: 'ditaa'; }
-  pre.src-dot:before { content: 'Graphviz'; }
-  pre.src-calc:before { content: 'Emacs Calc'; }
+  pre.src-sh:before    { content: 'sh'; }
+  pre.src-bash:before  { content: 'sh'; }
   pre.src-emacs-lisp:before { content: 'Emacs Lisp'; }
-  pre.src-fortran:before { content: 'Fortran'; }
-  pre.src-gnuplot:before { content: 'gnuplot'; }
-  pre.src-haskell:before { content: 'Haskell'; }
-  pre.src-hledger:before { content: 'hledger'; }
-  pre.src-java:before { content: 'Java'; }
-  pre.src-js:before { content: 'Javascript'; }
-  pre.src-latex:before { content: 'LaTeX'; }
-  pre.src-ledger:before { content: 'Ledger'; }
-  pre.src-lisp:before { content: 'Lisp'; }
-  pre.src-lilypond:before { content: 'Lilypond'; }
-  pre.src-lua:before { content: 'Lua'; }
-  pre.src-matlab:before { content: 'MATLAB'; }
-  pre.src-mscgen:before { content: 'Mscgen'; }
-  pre.src-ocaml:before { content: 'Objective Caml'; }
-  pre.src-octave:before { content: 'Octave'; }
-  pre.src-org:before { content: 'Org mode'; }
-  pre.src-oz:before { content: 'OZ'; }
-  pre.src-plantuml:before { content: 'Plantuml'; }
-  pre.src-processing:before { content: 'Processing.js'; }
-  pre.src-python:before { content: 'Python'; }
-  pre.src-R:before { content: 'R'; }
-  pre.src-ruby:before { content: 'Ruby'; }
-  pre.src-sass:before { content: 'Sass'; }
-  pre.src-scheme:before { content: 'Scheme'; }
-  pre.src-screen:before { content: 'Gnu Screen'; }
-  pre.src-sed:before { content: 'Sed'; }
-  pre.src-sh:before { content: 'shell'; }
-  pre.src-sql:before { content: 'SQL'; }
-  pre.src-sqlite:before { content: 'SQLite'; }
-  /* additional languages in org.el's org-babel-load-languages alist */
-  pre.src-forth:before { content: 'Forth'; }
-  pre.src-io:before { content: 'IO'; }
-  pre.src-J:before { content: 'J'; }
-  pre.src-makefile:before { content: 'Makefile'; }
-  pre.src-maxima:before { content: 'Maxima'; }
-  pre.src-perl:before { content: 'Perl'; }
-  pre.src-picolisp:before { content: 'Pico Lisp'; }
-  pre.src-scala:before { content: 'Scala'; }
-  pre.src-shell:before { content: 'Shell Script'; }
-  pre.src-ebnf2ps:before { content: 'ebfn2ps'; }
-  /* additional language identifiers per "defun org-babel-execute"
-       in ob-*.el */
-  pre.src-cpp:before  { content: 'C++'; }
-  pre.src-abc:before  { content: 'ABC'; }
-  pre.src-coq:before  { content: 'Coq'; }
-  pre.src-groovy:before  { content: 'Groovy'; }
-  /* additional language identifiers from org-babel-shell-names in
-     ob-shell.el: ob-shell is the only babel language using a lambda to put
-     the execution function name together. */
-  pre.src-bash:before  { content: 'bash'; }
-  pre.src-csh:before  { content: 'csh'; }
-  pre.src-ash:before  { content: 'ash'; }
-  pre.src-dash:before  { content: 'dash'; }
-  pre.src-ksh:before  { content: 'ksh'; }
-  pre.src-mksh:before  { content: 'mksh'; }
-  pre.src-posh:before  { content: 'posh'; }
-  /* Additional Emacs modes also supported by the LaTeX listings package */
-  pre.src-ada:before { content: 'Ada'; }
-  pre.src-asm:before { content: 'Assembler'; }
-  pre.src-caml:before { content: 'Caml'; }
-  pre.src-delphi:before { content: 'Delphi'; }
-  pre.src-html:before { content: 'HTML'; }
-  pre.src-idl:before { content: 'IDL'; }
-  pre.src-mercury:before { content: 'Mercury'; }
-  pre.src-metapost:before { content: 'MetaPost'; }
-  pre.src-modula-2:before { content: 'Modula-2'; }
-  pre.src-pascal:before { content: 'Pascal'; }
-  pre.src-ps:before { content: 'PostScript'; }
-  pre.src-prolog:before { content: 'Prolog'; }
-  pre.src-simula:before { content: 'Simula'; }
-  pre.src-tcl:before { content: 'tcl'; }
-  pre.src-tex:before { content: 'TeX'; }
-  pre.src-plain-tex:before { content: 'Plain TeX'; }
-  pre.src-verilog:before { content: 'Verilog'; }
-  pre.src-vhdl:before { content: 'VHDL'; }
-  pre.src-xml:before { content: 'XML'; }
-  pre.src-nxml:before { content: 'XML'; }
-  /* add a generic configuration mode; LaTeX export needs an additional
-     (add-to-list 'org-latex-listings-langs '(conf " ")) in .emacs */
-  pre.src-conf:before { content: 'Configuration File'; }
+  pre.src-R:before     { content: 'R'; }
+  pre.src-perl:before  { content: 'Perl'; }
+  pre.src-java:before  { content: 'Java'; }
+  pre.src-sql:before   { content: 'SQL'; }
 
   table { border-collapse:collapse; }
   caption.t-above { caption-side: top; }
   caption.t-bottom { caption-side: bottom; }
   td, th { vertical-align:top;  }
-  th.org-right  { text-align: center;  }
-  th.org-left   { text-align: center;   }
-  th.org-center { text-align: center; }
-  td.org-right  { text-align: right;  }
-  td.org-left   { text-align: left;   }
-  td.org-center { text-align: center; }
+  th.right  { text-align: center;  }
+  th.left   { text-align: center;   }
+  th.center { text-align: center; }
+  td.right  { text-align: right;  }
+  td.left   { text-align: left;   }
+  td.center { text-align: center; }
   dt { font-weight: bold; }
-  .footpara { display: inline; }
+  .footpara:nth-child(2) { display: inline; }
+  .footpara { display: block; }
   .footdef  { margin-bottom: 1em; }
   .figure { padding: 1em; }
   .figure p { text-align: center; }
@@ -180,7 +89,6 @@
     { font-size: 10px; font-weight: bold; white-space: nowrap; }
   .org-info-js_search-highlight
     { background-color: #ffff00; color: #000000; font-weight: bold; }
-  .org-svg { width: 90%; }
   /*]]>*/-->
 </style>
 <link rel="stylesheet" type="text/css" href="freedombone.css" />
@@ -189,7 +97,7 @@
 @licstart  The following is the entire license notice for the
 JavaScript code in this tag.
 
-Copyright (C) 2012-2017 Free Software Foundation, Inc.
+Copyright (C) 2012-2013 Free Software Foundation, Inc.
 
 The JavaScript code in this tag is free software: you can
 redistribute it and/or modify it under the terms of the GNU
@@ -236,6 +144,7 @@ for the JavaScript code in this tag.
 <a name="top" id="top"></a>
 </div>
 <div id="content">
+<h1 class="title"></h1>
 
 <div class="figure">
 <p><img src="images/logo.png" alt="logo.png" width="80%" height="10%" align="center" />
@@ -258,9 +167,9 @@ The base install of the system just contains an email server and Mutt client, bu
 </p>
 </div>
 
-<div id="outline-container-org9ebecbb" class="outline-2">
-<h2 id="org9ebecbb">Akaunting</h2>
-<div class="outline-text-2" id="text-org9ebecbb">
+<div id="outline-container-sec-1" class="outline-2">
+<h2 id="sec-1">Akaunting</h2>
+<div class="outline-text-2" id="text-1">
 <p>
 A web based accounts system for small businesses or freelancers.
 </p>
@@ -270,9 +179,9 @@ A web based accounts system for small businesses or freelancers.
 </p>
 </div>
 </div>
-<div id="outline-container-orgabfaf48" class="outline-2">
-<h2 id="orgabfaf48">BDS Mail</h2>
-<div class="outline-text-2" id="text-orgabfaf48">
+<div id="outline-container-sec-2" class="outline-2">
+<h2 id="sec-2">BDS Mail</h2>
+<div class="outline-text-2" id="text-2">
 <p>
 It's like ordinary email, but with <a href="https://en.wikipedia.org/wiki/I2P">i2p</a> as the transport mechanism.
 </p>
@@ -282,9 +191,9 @@ It's like ordinary email, but with <a href="https://en.wikipedia.org/wiki/I2P">i
 </p>
 </div>
 </div>
-<div id="outline-container-org3172e34" class="outline-2">
-<h2 id="org3172e34">Bludit</h2>
-<div class="outline-text-2" id="text-org3172e34">
+<div id="outline-container-sec-3" class="outline-2">
+<h2 id="sec-3">Bludit</h2>
+<div class="outline-text-2" id="text-3">
 <p>
 This is a simple databaseless blogging system which uses markdown files. It should run well on any hardware.
 </p>
@@ -294,9 +203,9 @@ This is a simple databaseless blogging system which uses markdown files. It shou
 </p>
 </div>
 </div>
-<div id="outline-container-org1e93869" class="outline-2">
-<h2 id="org1e93869">CryptPad</h2>
-<div class="outline-text-2" id="text-org1e93869">
+<div id="outline-container-sec-4" class="outline-2">
+<h2 id="sec-4">CryptPad</h2>
+<div class="outline-text-2" id="text-4">
 <p>
 Collaborate on editing documents, presentations and source code, or vote on things. All with a good level of security.
 </p>
@@ -306,9 +215,9 @@ Collaborate on editing documents, presentations and source code, or vote on thin
 </p>
 </div>
 </div>
-<div id="outline-container-org4f47b31" class="outline-2">
-<h2 id="org4f47b31">DLNA</h2>
-<div class="outline-text-2" id="text-org4f47b31">
+<div id="outline-container-sec-5" class="outline-2">
+<h2 id="sec-5">DLNA</h2>
+<div class="outline-text-2" id="text-5">
 <p>
 Enables you to use the system as a music server which any DLNA compatible devices can connect to within your home network.
 </p>
@@ -318,9 +227,9 @@ Enables you to use the system as a music server which any DLNA compatible device
 </p>
 </div>
 </div>
-<div id="outline-container-orga5d09ad" class="outline-2">
-<h2 id="orga5d09ad">Dokuwiki</h2>
-<div class="outline-text-2" id="text-orga5d09ad">
+<div id="outline-container-sec-6" class="outline-2">
+<h2 id="sec-6">Dokuwiki</h2>
+<div class="outline-text-2" id="text-6">
 <p>
 A databaseless wiki system.
 </p>
@@ -330,9 +239,9 @@ A databaseless wiki system.
 </p>
 </div>
 </div>
-<div id="outline-container-orgfd3fe55" class="outline-2">
-<h2 id="orgfd3fe55">Edith</h2>
-<div class="outline-text-2" id="text-orgfd3fe55">
+<div id="outline-container-sec-7" class="outline-2">
+<h2 id="sec-7">Edith</h2>
+<div class="outline-text-2" id="text-7">
 <p>
 Extremely simple and distraction-free notes system.
 </p>
@@ -342,9 +251,9 @@ Extremely simple and distraction-free notes system.
 </p>
 </div>
 </div>
-<div id="outline-container-org4180f98" class="outline-2">
-<h2 id="org4180f98">Emacs</h2>
-<div class="outline-text-2" id="text-org4180f98">
+<div id="outline-container-sec-8" class="outline-2">
+<h2 id="sec-8">Emacs</h2>
+<div class="outline-text-2" id="text-8">
 <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>
@@ -354,17 +263,17 @@ If you use the Mutt client to read your email then this will set it up to use em
 </p>
 </div>
 </div>
-<div id="outline-container-org8be04fc" class="outline-2">
-<h2 id="org8be04fc">Email Server</h2>
-<div class="outline-text-2" id="text-org8be04fc">
+<div id="outline-container-sec-9" class="outline-2">
+<h2 id="sec-9">Email Server</h2>
+<div class="outline-text-2" id="text-9">
 <p>
 Since many apps require email registration an email server is installed by default. You can find advice on using the email system <a href="./usage_email.html">here</a>.
 </p>
 </div>
 </div>
-<div id="outline-container-org95ea316" class="outline-2">
-<h2 id="org95ea316">Etherpad</h2>
-<div class="outline-text-2" id="text-org95ea316">
+<div id="outline-container-sec-10" class="outline-2">
+<h2 id="sec-10">Etherpad</h2>
+<div class="outline-text-2" id="text-10">
 <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>
@@ -374,9 +283,9 @@ Collaborate on creating documents in real time. Maybe you're planning a holiday
 </p>
 </div>
 </div>
-<div id="outline-container-org27dc49b" class="outline-2">
-<h2 id="org27dc49b">Federated wiki</h2>
-<div class="outline-text-2" id="text-org27dc49b">
+<div id="outline-container-sec-11" class="outline-2">
+<h2 id="sec-11">Federated wiki</h2>
+<div class="outline-text-2" id="text-11">
 <p>
 A new approach to creating wiki content.
 </p>
@@ -386,9 +295,9 @@ A new approach to creating wiki content.
 </p>
 </div>
 </div>
-<div id="outline-container-orge659bcd" class="outline-2">
-<h2 id="orge659bcd">Friendica</h2>
-<div class="outline-text-2" id="text-orge659bcd">
+<div id="outline-container-sec-12" class="outline-2">
+<h2 id="sec-12">Friendica</h2>
+<div class="outline-text-2" id="text-12">
 <p>
 Federated social network system.
 </p>
@@ -398,9 +307,9 @@ Federated social network system.
 </p>
 </div>
 </div>
-<div id="outline-container-org4d88ad9" class="outline-2">
-<h2 id="org4d88ad9">GNU Social</h2>
-<div class="outline-text-2" id="text-org4d88ad9">
+<div id="outline-container-sec-13" class="outline-2">
+<h2 id="sec-13">GNU Social</h2>
+<div class="outline-text-2" id="text-13">
 <p>
 Federated social network based on the OStatus protocol. You can "<i>remote follow</i>" other users within the GNU Social federation.
 </p>
@@ -410,9 +319,9 @@ Federated social network based on the OStatus protocol. You can "<i>remote follo
 </p>
 </div>
 </div>
-<div id="outline-container-orgb12489b" class="outline-2">
-<h2 id="orgb12489b">Gogs</h2>
-<div class="outline-text-2" id="text-orgb12489b">
+<div id="outline-container-sec-14" class="outline-2">
+<h2 id="sec-14">Gogs</h2>
+<div class="outline-text-2" id="text-14">
 <p>
 Lightweight git project hosting system. You can mirror projects from Github, or if Github turns evil then just host your own projects while retaining the familiar <i>fork-and-pull</i> workflow. If you can use Github then you can also use Gogs.
 </p>
@@ -422,9 +331,9 @@ Lightweight git project hosting system. You can mirror projects from Github, or
 </p>
 </div>
 </div>
-<div id="outline-container-org399677f" class="outline-2">
-<h2 id="org399677f">HTMLy</h2>
-<div class="outline-text-2" id="text-org399677f">
+<div id="outline-container-sec-15" class="outline-2">
+<h2 id="sec-15">HTMLy</h2>
+<div class="outline-text-2" id="text-15">
 <p>
 Databaseless blogging system. Quite simple and with a markdown-like format.
 </p>
@@ -434,9 +343,9 @@ Databaseless blogging system. Quite simple and with a markdown-like format.
 </p>
 </div>
 </div>
-<div id="outline-container-org2fcaeeb" class="outline-2">
-<h2 id="org2fcaeeb">Hubzilla</h2>
-<div class="outline-text-2" id="text-org2fcaeeb">
+<div id="outline-container-sec-16" class="outline-2">
+<h2 id="sec-16">Hubzilla</h2>
+<div class="outline-text-2" id="text-16">
 <p>
 Web publishing platform with social network like features and good privacy controls so that it's possible to specify who can see which content. Includes photo albums, calendar, wiki and file storage.
 </p>
@@ -446,9 +355,9 @@ Web publishing platform with social network like features and good privacy contr
 </p>
 </div>
 </div>
-<div id="outline-container-org0bce17a" class="outline-2">
-<h2 id="org0bce17a">Icecast media stream</h2>
-<div class="outline-text-2" id="text-org0bce17a">
+<div id="outline-container-sec-17" class="outline-2">
+<h2 id="sec-17">Icecast media stream</h2>
+<div class="outline-text-2" id="text-17">
 <p>
 Make your own internet radio station.
 </p>
@@ -458,9 +367,9 @@ Make your own internet radio station.
 </p>
 </div>
 </div>
-<div id="outline-container-orgd083573" class="outline-2">
-<h2 id="orgd083573">IRC Server (ngirc)</h2>
-<div class="outline-text-2" id="text-orgd083573">
+<div id="outline-container-sec-18" class="outline-2">
+<h2 id="sec-18">IRC Server (ngirc)</h2>
+<div class="outline-text-2" id="text-18">
 <p>
 Run your own IRC chat channel which can be secured with a password and accessible via an onion address. A bouncer is included so that you can receive messages sent while you were offline. Works with Hexchat and other popular clients.
 </p>
@@ -470,18 +379,18 @@ Run your own IRC chat channel which can be secured with a password and accessibl
 </p>
 </div>
 </div>
-<div id="outline-container-orgdaa15cf" class="outline-2">
-<h2 id="orgdaa15cf">Jitsi Meet</h2>
-<div class="outline-text-2" id="text-orgdaa15cf">
+<div id="outline-container-sec-19" class="outline-2">
+<h2 id="sec-19">Jitsi Meet</h2>
+<div class="outline-text-2" id="text-19">
 <p>
 Experimental WebRTC video conferencing system, similar to Google Hangouts. This may not be fully functional, but is hoped to be in the near future.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org15f9534" class="outline-2">
-<h2 id="org15f9534">KanBoard</h2>
-<div class="outline-text-2" id="text-org15f9534">
+<div id="outline-container-sec-20" class="outline-2">
+<h2 id="sec-20">KanBoard</h2>
+<div class="outline-text-2" id="text-20">
 <p>
 A simple kanban system for managing projects or TODO lists.
 </p>
@@ -491,9 +400,9 @@ A simple kanban system for managing projects or TODO lists.
 </p>
 </div>
 </div>
-<div id="outline-container-org1090474" class="outline-2">
-<h2 id="org1090474">Key Server</h2>
-<div class="outline-text-2" id="text-org1090474">
+<div id="outline-container-sec-21" class="outline-2">
+<h2 id="sec-21">Key Server</h2>
+<div class="outline-text-2" id="text-21">
 <p>
 An OpenPGP key server for storing and retrieving GPG public keys.
 </p>
@@ -503,9 +412,9 @@ An OpenPGP key server for storing and retrieving GPG public keys.
 </p>
 </div>
 </div>
-<div id="outline-container-org80f825f" class="outline-2">
-<h2 id="org80f825f">Koel</h2>
-<div class="outline-text-2" id="text-org80f825f">
+<div id="outline-container-sec-22" class="outline-2">
+<h2 id="sec-22">Koel</h2>
+<div class="outline-text-2" id="text-22">
 <p>
 Access your music collection from any internet connected device.
 </p>
@@ -515,9 +424,9 @@ Access your music collection from any internet connected device.
 </p>
 </div>
 </div>
-<div id="outline-container-orgd6e6623" class="outline-2">
-<h2 id="orgd6e6623">Lychee</h2>
-<div class="outline-text-2" id="text-orgd6e6623">
+<div id="outline-container-sec-23" class="outline-2">
+<h2 id="sec-23">Lychee</h2>
+<div class="outline-text-2" id="text-23">
 <p>
 Make your photo albums available on the web.
 </p>
@@ -527,9 +436,9 @@ Make your photo albums available on the web.
 </p>
 </div>
 </div>
-<div id="outline-container-org3588890" class="outline-2">
-<h2 id="org3588890">Mailpile</h2>
-<div class="outline-text-2" id="text-org3588890">
+<div id="outline-container-sec-24" class="outline-2">
+<h2 id="sec-24">Mailpile</h2>
+<div class="outline-text-2" id="text-24">
 <p>
 Modern email client which supports GPG encryption.
 </p>
@@ -539,9 +448,9 @@ Modern email client which supports GPG encryption.
 </p>
 </div>
 </div>
-<div id="outline-container-orgb1ec8b5" class="outline-2">
-<h2 id="orgb1ec8b5">Matrix</h2>
-<div class="outline-text-2" id="text-orgb1ec8b5">
+<div id="outline-container-sec-25" class="outline-2">
+<h2 id="sec-25">Matrix</h2>
+<div class="outline-text-2" id="text-25">
 <p>
 Multi-user chat with some security and moderation controls.
 </p>
@@ -551,9 +460,9 @@ Multi-user chat with some security and moderation controls.
 </p>
 </div>
 </div>
-<div id="outline-container-org2765a47" class="outline-2">
-<h2 id="org2765a47">Mediagoblin</h2>
-<div class="outline-text-2" id="text-org2765a47">
+<div id="outline-container-sec-26" class="outline-2">
+<h2 id="sec-26">Mediagoblin</h2>
+<div class="outline-text-2" id="text-26">
 <p>
 Publicly host video and audio files so that you don't need to use YouTube/Vimeo/etc.
 </p>
@@ -563,9 +472,9 @@ Publicly host video and audio files so that you don't need to use YouTube/Vimeo/
 </p>
 </div>
 </div>
-<div id="outline-container-org03e8661" class="outline-2">
-<h2 id="org03e8661">Mumble</h2>
-<div class="outline-text-2" id="text-org03e8661">
+<div id="outline-container-sec-27" class="outline-2">
+<h2 id="sec-27">Mumble</h2>
+<div class="outline-text-2" id="text-27">
 <p>
 The popular VoIP and text chat system. Say goodbye to old-fashioned telephony conferences with silly dial codes. Also works well on mobile.
 </p>
@@ -575,9 +484,9 @@ The popular VoIP and text chat system. Say goodbye to old-fashioned telephony co
 </p>
 </div>
 </div>
-<div id="outline-container-org2be2a1a" class="outline-2">
-<h2 id="org2be2a1a">NextCloud</h2>
-<div class="outline-text-2" id="text-org2be2a1a">
+<div id="outline-container-sec-28" class="outline-2">
+<h2 id="sec-28">NextCloud</h2>
+<div class="outline-text-2" id="text-28">
 <p>
 Store files on your server and sync them with laptops or mobile devices. Includes many plugins including videoconferencing and collaborative document editing.
 </p>
@@ -587,9 +496,9 @@ Store files on your server and sync them with laptops or mobile devices. Include
 </p>
 </div>
 </div>
-<div id="outline-container-orga9b8ff0" class="outline-2">
-<h2 id="orga9b8ff0">PeerTube</h2>
-<div class="outline-text-2" id="text-orga9b8ff0">
+<div id="outline-container-sec-29" class="outline-2">
+<h2 id="sec-29">PeerTube</h2>
+<div class="outline-text-2" id="text-29">
 <p>
 Peer-to-peer video hosting. Similar to Mediagoblin, but the P2P aspect better enables the streaming load to be shared across servers.
 </p>
@@ -599,9 +508,9 @@ Peer-to-peer video hosting. Similar to Mediagoblin, but the P2P aspect better en
 </p>
 </div>
 </div>
-<div id="outline-container-orge124cb5" class="outline-2">
-<h2 id="orge124cb5">PI-Hole</h2>
-<div class="outline-text-2" id="text-orge124cb5">
+<div id="outline-container-sec-30" class="outline-2">
+<h2 id="sec-30">PI-Hole</h2>
+<div class="outline-text-2" id="text-30">
 <p>
 The black hole for web adverts. Block adverts at the domain name level within your local network. It can significantly reduce bandwidth, speed up page load times and protect your systems from being tracked by spyware.
 </p>
@@ -611,9 +520,9 @@ The black hole for web adverts. Block adverts at the domain name level within yo
 </p>
 </div>
 </div>
-<div id="outline-container-org7d249a4" class="outline-2">
-<h2 id="org7d249a4">Pleroma</h2>
-<div class="outline-text-2" id="text-org7d249a4">
+<div id="outline-container-sec-31" class="outline-2">
+<h2 id="sec-31">Pleroma</h2>
+<div class="outline-text-2" id="text-31">
 <p>
 Fediverse instance which is compatible with GNU Social and Mastodon, and suited for systems without much RAM or CPU resource.
 </p>
@@ -623,9 +532,9 @@ Fediverse instance which is compatible with GNU Social and Mastodon, and suited
 </p>
 </div>
 </div>
-<div id="outline-container-orgce303d5" class="outline-2">
-<h2 id="orgce303d5">PostActiv</h2>
-<div class="outline-text-2" id="text-orgce303d5">
+<div id="outline-container-sec-32" class="outline-2">
+<h2 id="sec-32">PostActiv</h2>
+<div class="outline-text-2" id="text-32">
 <p>
 An alternative federated social networking system compatible with GNU Social, Pleroma and Mastodon. It includes some optimisations and fixes currently not available within the main GNU Social project.
 </p>
@@ -635,9 +544,9 @@ An alternative federated social networking system compatible with GNU Social, Pl
 </p>
 </div>
 </div>
-<div id="outline-container-orgfc8be3c" class="outline-2">
-<h2 id="orgfc8be3c">PrivateBin</h2>
-<div class="outline-text-2" id="text-orgfc8be3c">
+<div id="outline-container-sec-33" class="outline-2">
+<h2 id="sec-33">PrivateBin</h2>
+<div class="outline-text-2" id="text-33">
 <p>
 A pastebin where the server has zero knowledge of the content being pasted.
 </p>
@@ -647,9 +556,9 @@ A pastebin where the server has zero knowledge of the content being pasted.
 </p>
 </div>
 </div>
-<div id="outline-container-org169bce5" class="outline-2">
-<h2 id="org169bce5">Profanity</h2>
-<div class="outline-text-2" id="text-org169bce5">
+<div id="outline-container-sec-34" class="outline-2">
+<h2 id="sec-34">Profanity</h2>
+<div class="outline-text-2" id="text-34">
 <p>
 A shell based XMPP client which you can run on the Freedombone server via ssh.
 </p>
@@ -659,9 +568,9 @@ A shell based XMPP client which you can run on the Freedombone server via ssh.
 </p>
 </div>
 </div>
-<div id="outline-container-orgef8d37a" class="outline-2">
-<h2 id="orgef8d37a">Riot Web</h2>
-<div class="outline-text-2" id="text-orgef8d37a">
+<div id="outline-container-sec-35" class="outline-2">
+<h2 id="sec-35">Riot Web</h2>
+<div class="outline-text-2" id="text-35">
 <p>
 A browser based user interface for the Matrix federated communications system, including WebRTC audio and video chat.
 </p>
@@ -671,9 +580,9 @@ A browser based user interface for the Matrix federated communications system, i
 </p>
 </div>
 </div>
-<div id="outline-container-orgb2b8eaf" class="outline-2">
-<h2 id="orgb2b8eaf">Rocketchat</h2>
-<div class="outline-text-2" id="text-orgb2b8eaf">
+<div id="outline-container-sec-36" class="outline-2">
+<h2 id="sec-36">Rocketchat</h2>
+<div class="outline-text-2" id="text-36">
 <p>
 A non-federated chat server (x86 systems only).
 </p>
@@ -683,9 +592,9 @@ A non-federated chat server (x86 systems only).
 </p>
 </div>
 </div>
-<div id="outline-container-org86dc8e9" class="outline-2">
-<h2 id="org86dc8e9">SearX</h2>
-<div class="outline-text-2" id="text-org86dc8e9">
+<div id="outline-container-sec-37" class="outline-2">
+<h2 id="sec-37">SearX</h2>
+<div class="outline-text-2" id="text-37">
 <p>
 A metasearch engine for customised and private web searches.
 </p>
@@ -695,21 +604,21 @@ A metasearch engine for customised and private web searches.
 </p>
 </div>
 </div>
-<div id="outline-container-orgd3988e5" class="outline-2">
-<h2 id="orgd3988e5">tt-rss</h2>
-<div class="outline-text-2" id="text-orgd3988e5">
+<div id="outline-container-sec-38" class="outline-2">
+<h2 id="sec-38">Smol RSS</h2>
+<div class="outline-text-2" id="text-38">
 <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.
+A very minimal RSS reader.
 </p>
 
 <p>
-<a href="./app_rss.html">How to use it</a>
+<a href="./app_smolrss.html">How to use it</a>
 </p>
 </div>
 </div>
-<div id="outline-container-org773fb88" class="outline-2">
-<h2 id="org773fb88">Syncthing</h2>
-<div class="outline-text-2" id="text-org773fb88">
+<div id="outline-container-sec-39" class="outline-2">
+<h2 id="sec-39">Syncthing</h2>
+<div class="outline-text-2" id="text-39">
 <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>
@@ -719,9 +628,21 @@ Possibly the best way to synchronise files across all of your devices. Once it h
 </p>
 </div>
 </div>
-<div id="outline-container-org6ad810d" class="outline-2">
-<h2 id="org6ad810d">Tahoe-LAFS</h2>
-<div class="outline-text-2" id="text-org6ad810d">
+<div id="outline-container-sec-40" class="outline-2">
+<h2 id="sec-40">tt-rss</h2>
+<div class="outline-text-2" id="text-40">
+<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>
+
+<p>
+<a href="./app_rss.html">How to use it</a>
+</p>
+</div>
+</div>
+<div id="outline-container-sec-41" class="outline-2">
+<h2 id="sec-41">Tahoe-LAFS</h2>
+<div class="outline-text-2" id="text-41">
 <p>
 Robust and encrypted storage of files on one or more server.
 </p>
@@ -731,9 +652,9 @@ Robust and encrypted storage of files on one or more server.
 </p>
 </div>
 </div>
-<div id="outline-container-orgc866a19" class="outline-2">
-<h2 id="orgc866a19">Tox</h2>
-<div class="outline-text-2" id="text-orgc866a19">
+<div id="outline-container-sec-42" class="outline-2">
+<h2 id="sec-42">Tox</h2>
+<div class="outline-text-2" id="text-42">
 <p>
 Client and bootstrap node for the Tox chat/VoIP system.
 </p>
@@ -743,9 +664,9 @@ Client and bootstrap node for the Tox chat/VoIP system.
 </p>
 </div>
 </div>
-<div id="outline-container-orge8c9d44" class="outline-2">
-<h2 id="orge8c9d44">Turtl</h2>
-<div class="outline-text-2" id="text-orge8c9d44">
+<div id="outline-container-sec-43" class="outline-2">
+<h2 id="sec-43">Turtl</h2>
+<div class="outline-text-2" id="text-43">
 <p>
 A system for privately creating and sharing notes and images, similar to Evernote but without the spying.
 </p>
@@ -755,18 +676,18 @@ A system for privately creating and sharing notes and images, similar to Evernot
 </p>
 </div>
 </div>
-<div id="outline-container-org99b644d" class="outline-2">
-<h2 id="org99b644d">Vim</h2>
-<div class="outline-text-2" id="text-org99b644d">
+<div id="outline-container-sec-44" class="outline-2">
+<h2 id="sec-44">Vim</h2>
+<div class="outline-text-2" id="text-44">
 <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-org880c87c" class="outline-2">
-<h2 id="org880c87c">Virtual Private Network (VPN)</h2>
-<div class="outline-text-2" id="text-org880c87c">
+<div id="outline-container-sec-45" class="outline-2">
+<h2 id="sec-45">Virtual Private Network (VPN)</h2>
+<div class="outline-text-2" id="text-45">
 <p>
 Set up a VPN on your server so that you can bypass local internet censorship.
 </p>
@@ -776,9 +697,9 @@ Set up a VPN on your server so that you can bypass local internet censorship.
 </p>
 </div>
 </div>
-<div id="outline-container-org6237f89" class="outline-2">
-<h2 id="org6237f89">XMPP</h2>
-<div class="outline-text-2" id="text-org6237f89">
+<div id="outline-container-sec-46" class="outline-2">
+<h2 id="sec-46">XMPP</h2>
+<div class="outline-text-2" id="text-46">
 <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>