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

doc/EN/app_akaunting.org

@@ -0,0 +1,46 @@
+#+TITLE:
+#+AUTHOR: Bob Mottram
+#+EMAIL: bob@freedombone.net
+#+KEYWORDS: freedombone, akaunting
+#+DESCRIPTION: How to use Akaunting
+#+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>Akaunting</h1>
+</center>
+#+END_EXPORT
+
+The Freedombone system isn't primarily aimed at companies or institutions, but if you're a one person company or freelancer then having the ability to run your own accounting system and keep the data private and also backed up is useful. Akaunting provides a nice web based system for small business accounts, and is also quite usable within a mobile web browser.
+
+* Installation
+Log into your system with:
+
+#+begin_src bash
+ssh myusername@mydomain -p 2222
+#+end_src
+
+Using cursor keys, space bar and Enter key select *Administrator controls* and type in your password.
+
+Select *Add/Remove Apps* then *akaunting*. Enter the subdomain that you which to use, such as *accounts.mydomain.net*, and optionally a FreeDNS code.
+
+From the *Administrator control panel* select *Passwords* and look up the password for *mariadb*.
+
+Now in a browser navigate to your subdomain. You will need to enter some details for the database. The password should be the mariadb one.
+
+#+BEGIN_CENTER
+[[file:images/akaunting_setup.jpg]]
+#+END_CENTER
+
+After that you'll need to enter a company name and an email address. You can make the administrator password anything you prefer, and a suggestion can be found within the *Passwords* section of the *Administrator control panel* under *akaunting*.
+
+#+BEGIN_CENTER
+[[file:images/akaunting_setup_company.jpg]]
+#+END_CENTER
+
+From then on the system should be usable. Accounts software can often be quite complex, and so you'll probably want to refer to the [[https://akaunting.com/docs][official documentation]] for details.

doc/EN/apps.org

@@ -24,6 +24,11 @@ The base install of the system just contains an email server and Mutt client, bu
 [[file:images/controlpanel/control_panel_apps.jpg]]
 #+END_CENTER
 
+
+* Akaunting
+A web based accounts system for small businesses or freelancers.
+
+[[./app_akaunting.html][How to use it]]
 * CryptPad
 Collaborate on editing documents, presentations and source code, or vote on things. All with a good level of security.
 

doc/EN/index.org

@@ -37,7 +37,7 @@ After installation it's possible that you might want some advice on how to run y
  * [[./faq.html][Frequently Asked Questions]]
  * [[./mobile.html][Advice on setting up a mobile phone]]
 
-If you find bugs, or want to add a new app to this system see the [[./devguide.html][Developers Guide]] and [[./codeofconduct.html][Code of Conduct]].
+If you find bugs, or want to add a new app to this system see the [[./devguide.html][Developers Guide]] and [[./codeofconduct.html][Code of Conduct]]. There is a Matrix chat room available at *#fbone:matrix.freedombone.net*.
 
 Ready made disk images which can be copied onto USB or microSD drives are [[./downloads/current][available here]].
 

doc/EN/mobile.org

@@ -23,7 +23,7 @@ Mobile phones are insecure devices, but they're regarded as being so essential t
  <table style="width:80%; border:0">
   <tr>
     <td><center><b><h3>Open</h3></b><br>Use a free and open source operating system. Open means more trustworthy</center></td>
-    <td><center><b><h3>Remove</h3></b><br>If there are any proprietary apps then remove or deactivete them</center></td>
+    <td><center><b><h3>Remove</h3></b><br>If there are any proprietary apps then remove or deactivate them</center></td>
   </tr>
   <tr>
     <td><center><b><h3>Encrypt</h3></b><br>Make sure your phone is encrypted with a password which isn't easy to guess</center></td>

src/freedombone-app-akaunting

@@ -0,0 +1,470 @@
+#!/bin/bash
+#
+# .---.                  .              .
+# |                      |              |
+# |--- .--. .-.  .-.  .-.|  .-. .--.--. |.-.  .-. .--.  .-.
+# |    |   (.-' (.-' (   | (   )|  |  | |   )(   )|  | (.-'
+# '    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'
+#
+#                    Freedom in the Cloud
+#
+# Personal or small business accounts
+#
+# License
+# =======
+#
+# Copyright (C) 2017 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 media'
+
+IN_DEFAULT_INSTALL=0
+SHOW_ON_ABOUT=1
+
+AKAUNTING_DOMAIN_NAME=
+AKAUNTING_CODE=
+AKAUNTING_ONION_PORT=8341
+AKAUNTING_REPO="https://github.com/akaunting/akaunting"
+AKAUNTING_COMMIT='b68c840cded60d92b86e98fcbc26ce338cf93fef'
+AKAUNTING_ADMIN_PASSWORD=
+
+AKAUNTING_BACKGROUND_IMAGE_URL=
+
+akaunting_variables=(ONION_ONLY
+                     AKAUNTING_DOMAIN_NAME
+                     AKAUNTING_CODE
+                     DDNS_PROVIDER
+                     MY_USERNAME)
+
+function akaunting_remove_bad_links {
+    cd /var/www/$AKAUNTING_DOMAIN_NAME/htdocs
+
+    # copy jquery locally
+    jquery_version='1.12.4'
+    if [ ! -f jquery-${jquery_version}.js ]; then
+        cd /var/www/$GHOST_DOMAIN_NAME/htdocs
+        wget https://code.jquery.com/jquery-${jquery_version}.js
+        jquery_hash=$(sha256sum jquery-${jquery_version}.js | awk -F ' ' '{print $1}')
+        if [[ "$jquery_hash" != '430f36f9b5f21aae8cc9dca6a81c4d3d84da5175eaedcf2fdc2c226302cb3575' ]]; then
+            echo $'Unexpected jquery hash value'
+            exit 78363527
+        fi
+    fi
+
+    sed -i '/googleapi/d' resources/assets/sass/app.scss
+    sed -i "s|ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js|$AKAUNTING_DOMAIN_NAME/jquery-${jquery_version}.js|g" vendor/league/flysystem/docs/_layouts/default.html
+    sed -i '/googleapi/d' vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/503.blade.php
+    sed -i '/googleapi/d' vendor/almasaeed2010/adminlte/build/less/AdminLTE-without-plugins.less
+    sed -i '/googleapi/d' vendor/almasaeed2010/adminlte/build/less/AdminLTE.less
+    sed -i '/googleapi/d' vendor/almasaeed2010/adminlte/dist/css/AdminLTE.css
+    sed -i '/googleapi/d' vendor/almasaeed2010/adminlte/dist/css/AdminLTE.min.css
+    sed -i '/googleapi/d' vendor/almasaeed2010/adminlte/dist/css/alt/AdminLTE-without-plugins.css
+    sed -i '/googleapi/d' vendor/almasaeed2010/adminlte/dist/css/alt/AdminLTE-without-plugins.min.css
+    sed -i "s|ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js|$AKAUNTING_DOMAIN_NAME/jquery-${jquery_version}.js|g" vendor/almasaeed2010/adminlte/plugins/ckeditor/samples/old/jquery.html
+
+    chown -R www-data:www-data /var/www/$AKAUNTING_DOMAIN_NAME/htdocs
+}
+
+function logging_on_akaunting {
+    echo -n ''
+}
+
+function logging_off_akaunting {
+    echo -n ''
+}
+
+function remove_user_akaunting {
+    remove_username="$1"
+
+    ${PROJECT_NAME}-pass -u $remove_username --rmapp akaunting
+}
+
+function add_user_akaunting {
+    new_username="$1"
+    new_user_password="$2"
+
+    ${PROJECT_NAME}-pass -u $new_username -a akaunting -p "$new_user_password"
+
+    echo '0'
+}
+
+function install_interactive_akaunting {
+    if [ ! $ONION_ONLY ]; then
+        ONION_ONLY='no'
+    fi
+
+    if [[ $ONION_ONLY != "no" ]]; then
+        AKAUNTING_DOMAIN_NAME='akaunting.local'
+    else
+        AKAUNTING_DETAILS_COMPLETE=
+        while [ ! $AKAUNTING_DETAILS_COMPLETE ]
+        do
+            data=$(tempfile 2>/dev/null)
+            trap "rm -f $data" 0 1 2 5 15
+            if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
+                dialog --backtitle $"Freedombone Configuration" \
+                       --title $"Akaunting Configuration" \
+                       --form $"\nPlease enter your Akaunting details.\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 14 65 2 \
+                       $"Domain:" 1 1 "$(grep 'AKAUNTING_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 25 33 40 \
+                       $"Code:" 2 1 "$(grep 'AKAUNTING_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 25 33 255 \
+                       2> $data
+            else
+                dialog --backtitle $"Freedombone Configuration" \
+                       --title $"Akaunting Configuration" \
+                       --form $"\nPlease enter your Akaunting details.\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 14 65 2 \
+                       $"Domain:" 1 1 "$(grep 'AKAUNTING_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 25 33 40 \
+                       2> $data
+            fi
+            sel=$?
+            case $sel in
+                1) exit 1;;
+                255) exit 1;;
+            esac
+            AKAUNTING_DOMAIN_NAME=$(cat $data | sed -n 1p)
+            if [ $AKAUNTING_DOMAIN_NAME ]; then
+                if [[ $AKAUNTING_DOMAIN_NAME == "$HUBZILLA_DOMAIN_NAME" ]]; then
+                    AKAUNTING_DOMAIN_NAME=""
+                fi
+                TEST_DOMAIN_NAME=$AKAUNTING_DOMAIN_NAME
+                validate_domain_name
+                if [[ $TEST_DOMAIN_NAME != $AKAUNTING_DOMAIN_NAME ]]; then
+                    AKAUNTING_DOMAIN_NAME=
+                    dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
+                else
+                    if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
+                        AKAUNTING_CODE=$(cat $data | sed -n 2p)
+                        validate_freedns_code "$AKAUNTING_CODE"
+                        if [ ! $VALID_CODE ]; then
+                            AKAUNTING_DOMAIN_NAME=
+                        fi
+                    fi
+                fi
+            fi
+            if [ $AKAUNTING_DOMAIN_NAME ]; then
+                AKAUNTING_DETAILS_COMPLETE="yes"
+            fi
+        done
+
+        write_config_param "AKAUNTING_CODE" "$AKAUNTING_CODE"
+    fi
+    write_config_param "AKAUNTING_DOMAIN_NAME" "$AKAUNTING_DOMAIN_NAME"
+    APP_INSTALLED=1
+}
+
+function change_password_akaunting {
+    curr_username="$1"
+    new_user_password="$2"
+
+    read_config_param 'AKAUNTING_DOMAIN_NAME'
+
+    ${PROJECT_NAME}-pass -u "$curr_username" -a akaunting -p "$new_user_password"
+}
+
+function akaunting_create_database {
+    if [ -f $IMAGE_PASSWORD_FILE ]; then
+        AKAUNTING_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
+    else
+        if [ ! $AKAUNTING_ADMIN_PASSWORD ]; then
+            AKAUNTING_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
+        fi
+    fi
+    if [ ! $AKAUNTING_ADMIN_PASSWORD ]; then
+        return
+    fi
+
+    function_check create_database
+    create_database akaunting "$AKAUNTING_ADMIN_PASSWORD" $MY_USERNAME
+}
+
+function reconfigure_akaunting {
+    echo -n ''
+}
+
+function upgrade_akaunting {
+    CURR_AKAUNTING_COMMIT=$(get_completion_param "akaunting commit")
+    if [[ "$CURR_AKAUNTING_COMMIT" == "$AKAUNTING_COMMIT" ]]; then
+        return
+    fi
+
+    if grep -q "akaunting domain" $COMPLETION_FILE; then
+        AKAUNTING_DOMAIN_NAME=$(get_completion_param "akaunting domain")
+    fi
+
+    # update to the next commit
+    function_check set_repo_commit
+    set_repo_commit /var/www/$AKAUNTING_DOMAIN_NAME/htdocs "akaunting commit" "$AKAUNTING_COMMIT" $AKAUNTING_REPO
+
+    cd /var/www/$AKAUNTING_DOMAIN_NAME/htdocs
+    install_composer
+    akaunting_remove_bad_links
+
+    chown -R www-data:www-data /var/www/${AKAUNTING_DOMAIN_NAME}/htdocs
+}
+
+
+function backup_local_akaunting {
+    akaunting_path=/var/www/${AKAUNTING_DOMAIN_NAME}/htdocs
+    if [ -d $akaunting_path ]; then
+        suspend_site ${AKAUNTING_DOMAIN_NAME}
+        function_check backup_database_to_usb
+        backup_database_to_usb akaunting
+        backup_directory_to_usb $akaunting_path akaunting
+        restart_site
+    fi
+}
+
+function restore_local_akaunting {
+    temp_restore_dir=/root/tempakaunting
+    akaunting_dir=/var/www/${AKAUNTING_DOMAIN_NAME}/htdocs
+
+    suspend_site ${AKAUNTING_DOMAIN_NAME}
+
+    function_check akaunting_create_database
+    akaunting_create_database
+
+    restore_database akaunting ${AKAUNTING_DOMAIN_NAME}
+    chown www-data:www-data $akaunting_dir
+
+    restart_site
+}
+
+function backup_remote_akaunting {
+    akaunting_path=/var/www/${AKAUNTING_DOMAIN_NAME}/htdocs
+    if [ -d $akaunting_path ]; then
+        suspend_site ${AKAUNTING_DOMAIN_NAME}
+        function_check backup_database_to_friend
+        backup_database_to_friend akaunting
+        backup_directory_to_friend $akaunting_path akaunting
+        restart_site
+    fi
+}
+
+function restore_remote_akaunting {
+    temp_restore_dir=/root/tempakaunting
+    akaunting_dir=/var/www/${AKAUNTING_DOMAIN_NAME}/htdocs
+
+    suspend_site ${AKAUNTING_DOMAIN_NAME}
+
+    function_check akaunting_create_database
+    akaunting_create_database
+
+    restore_database_from_friend akaunting ${AKAUNTING_DOMAIN_NAME}
+    chown www-data:www-data $akaunting_dir
+
+    restart_site
+}
+
+function remove_akaunting {
+    if [ ${#AKAUNTING_DOMAIN_NAME} -eq 0 ]; then
+        return
+    fi
+
+    read_config_param "AKAUNTING_DOMAIN_NAME"
+    read_config_param "MY_USERNAME"
+    echo "Removing $AKAUNTING_DOMAIN_NAME"
+    nginx_dissite $AKAUNTING_DOMAIN_NAME
+    remove_certs $AKAUNTING_DOMAIN_NAME
+
+    if [ -d /var/www/$AKAUNTING_DOMAIN_NAME ]; then
+        rm -rf /var/www/$AKAUNTING_DOMAIN_NAME
+    fi
+    if [ -f /etc/nginx/sites-available/$AKAUNTING_DOMAIN_NAME ]; then
+        rm /etc/nginx/sites-available/$AKAUNTING_DOMAIN_NAME
+    fi
+    function_check drop_database
+    drop_database akaunting
+    function_check remove_onion_service
+    remove_onion_service akaunting ${AKAUNTING_ONION_PORT}
+    if grep -q "akaunting" /etc/crontab; then
+        sed -i "/akaunting/d" /etc/crontab
+    fi
+    remove_app akaunting
+    remove_completion_param install_akaunting
+    sed -i '/akaunting/d' $COMPLETION_FILE
+
+    function_check remove_ddns_domain
+    remove_ddns_domain $AKAUNTING_DOMAIN_NAME
+}
+
+function install_akaunting {
+    if [ ! $ONION_ONLY ]; then
+        ONION_ONLY='no'
+    fi
+
+    if [ ! $AKAUNTING_DOMAIN_NAME ]; then
+        echo $'No domain name was given for akaunting'
+        exit 89353
+    fi
+
+    function_check install_mariadb
+    install_mariadb
+
+    function_check get_mariadb_password
+    get_mariadb_password
+
+    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
+
+    if [ ! -d /var/www/$AKAUNTING_DOMAIN_NAME ]; then
+        mkdir /var/www/$AKAUNTING_DOMAIN_NAME
+    fi
+    if [ ! -d /var/www/$AKAUNTING_DOMAIN_NAME/htdocs ]; then
+        if [ -d /repos/akaunting ]; then
+            mkdir /var/www/$AKAUNTING_DOMAIN_NAME/htdocs
+            cp -r -p /repos/akaunting/. /var/www/$AKAUNTING_DOMAIN_NAME/htdocs
+            cd /var/www/$AKAUNTING_DOMAIN_NAME/htdocs
+            git pull
+        else
+            function_check git_clone
+            git_clone $AKAUNTING_REPO /var/www/$AKAUNTING_DOMAIN_NAME/htdocs
+        fi
+
+        if [ ! -d /var/www/$AKAUNTING_DOMAIN_NAME/htdocs ]; then
+            echo $'Unable to clone akaunting repo'
+            exit 2589389
+        fi
+    fi
+
+    cd /var/www/$AKAUNTING_DOMAIN_NAME/htdocs
+    git checkout $AKAUNTING_COMMIT -b $AKAUNTING_COMMIT
+    set_completion_param "akaunting commit" "$AKAUNTING_COMMIT"
+
+    chmod g+w /var/www/$AKAUNTING_DOMAIN_NAME/htdocs
+    chown -R www-data:www-data /var/www/$AKAUNTING_DOMAIN_NAME/htdocs
+
+    cd /var/www/$AKAUNTING_DOMAIN_NAME/htdocs
+    install_composer
+
+    function_check akaunting_create_database
+    akaunting_create_database
+
+    function_check add_ddns_domain
+    add_ddns_domain $AKAUNTING_DOMAIN_NAME
+
+    AKAUNTING_ONION_HOSTNAME=$(add_onion_service akaunting 80 ${AKAUNTING_ONION_PORT})
+
+    akaunting_nginx_site=/etc/nginx/sites-available/$AKAUNTING_DOMAIN_NAME
+    if [[ $ONION_ONLY == "no" ]]; then
+        function_check nginx_http_redirect
+        nginx_http_redirect $AKAUNTING_DOMAIN_NAME "index index.php"
+        echo 'server {' >> $akaunting_nginx_site
+        echo '  listen 443 ssl;' >> $akaunting_nginx_site
+        echo '  listen [::]:443 ssl;' >> $akaunting_nginx_site
+        echo "  server_name $AKAUNTING_DOMAIN_NAME;" >> $akaunting_nginx_site
+        echo '' >> $akaunting_nginx_site
+        function_check nginx_compress
+        nginx_compress $AKAUNTING_DOMAIN_NAME
+        echo '' >> $akaunting_nginx_site
+        echo '  # Security' >> $akaunting_nginx_site
+        function_check nginx_ssl
+        nginx_ssl $AKAUNTING_DOMAIN_NAME
+
+        function_check nginx_disable_sniffing
+        nginx_disable_sniffing $AKAUNTING_DOMAIN_NAME
+
+        echo '  add_header Strict-Transport-Security max-age=15768000;' >> $akaunting_nginx_site
+        echo '' >> $akaunting_nginx_site
+        echo '  access_log /dev/null;' >> $akaunting_nginx_site
+        echo '  error_log /dev/null;' >> $akaunting_nginx_site
+        echo '' >> $akaunting_nginx_site
+        echo "  root /var/www/$AKAUNTING_DOMAIN_NAME/htdocs;" >> $akaunting_nginx_site
+        echo '' >> $akaunting_nginx_site
+        echo '  index index.php;' >> $akaunting_nginx_site
+        echo '' >> $akaunting_nginx_site
+        echo '  location ~ \.php {' >> $akaunting_nginx_site
+        echo '    include snippets/fastcgi-php.conf;' >> $akaunting_nginx_site
+        echo '    fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;' >> $akaunting_nginx_site
+        echo '    fastcgi_read_timeout 30;' >> $akaunting_nginx_site
+        echo '  }' >> $akaunting_nginx_site
+        echo '' >> $akaunting_nginx_site
+        echo '  location / {' >> $akaunting_nginx_site
+        function_check nginx_limits
+        nginx_limits $AKAUNTING_DOMAIN_NAME '15m'
+        echo '    try_files $uri $uri/ @akaunting;' >> $akaunting_nginx_site
+        echo '  }' >> $akaunting_nginx_site
+        echo '' >> $akaunting_nginx_site
+        echo '  location @akaunting {' >> $akaunting_nginx_site
+        echo '    rewrite ^(.*)$ /index.php?p=$1 last;' >> $akaunting_nginx_site
+        echo '  }' >> $akaunting_nginx_site
+        echo '' >> $akaunting_nginx_site
+        echo '  location ~ /\.(ht|git) {' >> $akaunting_nginx_site
+        echo '    deny all;' >> $akaunting_nginx_site
+        echo '  }' >> $akaunting_nginx_site
+        echo '' >> $akaunting_nginx_site
+        echo '}' >> $akaunting_nginx_site
+    else
+        echo -n '' > $akaunting_nginx_site
+    fi
+    echo 'server {' >> $akaunting_nginx_site
+    echo "    listen 127.0.0.1:$AKAUNTING_ONION_PORT default_server;" >> $akaunting_nginx_site
+    echo "    server_name $AKAUNTING_ONION_HOSTNAME;" >> $akaunting_nginx_site
+    echo '' >> $akaunting_nginx_site
+    function_check nginx_compress
+    nginx_compress $AKAUNTING_DOMAIN_NAME
+    echo '' >> $akaunting_nginx_site
+    function_check nginx_disable_sniffing
+    nginx_disable_sniffing $AKAUNTING_DOMAIN_NAME
+    echo '' >> $akaunting_nginx_site
+    echo '  access_log /dev/null;' >> $akaunting_nginx_site
+    echo '  error_log /dev/null;' >> $akaunting_nginx_site
+    echo '' >> $akaunting_nginx_site
+    echo "  root /var/www/$AKAUNTING_DOMAIN_NAME/htdocs;" >> $akaunting_nginx_site
+    echo '' >> $akaunting_nginx_site
+    echo '  index index.php;' >> $akaunting_nginx_site
+    echo '' >> $akaunting_nginx_site
+    echo '  location ~ \.php {' >> $akaunting_nginx_site
+    echo '    include snippets/fastcgi-php.conf;' >> $akaunting_nginx_site
+    echo '    fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;' >> $akaunting_nginx_site
+    echo '    fastcgi_read_timeout 30;' >> $akaunting_nginx_site
+    echo '  }' >> $akaunting_nginx_site
+    echo '' >> $akaunting_nginx_site
+    echo '  location / {' >> $akaunting_nginx_site
+    function_check nginx_limits
+    nginx_limits $AKAUNTING_DOMAIN_NAME '15m'
+    echo '    try_files $uri $uri/ @akaunting;' >> $akaunting_nginx_site
+    echo '  }' >> $akaunting_nginx_site
+    echo '' >> $akaunting_nginx_site
+    echo '  location @akaunting {' >> $akaunting_nginx_site
+    echo '    rewrite ^(.*)$ /index.php?p=$1 last;' >> $akaunting_nginx_site
+    echo '  }' >> $akaunting_nginx_site
+    echo '' >> $akaunting_nginx_site
+    echo '  location ~ /\.(ht|git) {' >> $akaunting_nginx_site
+    echo '    deny all;' >> $akaunting_nginx_site
+    echo '  }' >> $akaunting_nginx_site
+    echo '}' >> $akaunting_nginx_site
+
+    function_check configure_php
+    configure_php
+
+    function_check create_site_certificate
+    create_site_certificate $AKAUNTING_DOMAIN_NAME 'yes'
+
+    function_check nginx_ensite
+    nginx_ensite $AKAUNTING_DOMAIN_NAME
+
+    akaunting_remove_bad_links
+
+    systemctl restart mariadb
+    systemctl restart php7.0-fpm
+    systemctl restart nginx
+
+    ${PROJECT_NAME}-pass -u $MY_USERNAME -a akaunting -p "$AKAUNTING_ADMIN_PASSWORD"
+
+    set_completion_param "akaunting domain" "$AKAUNTING_DOMAIN_NAME"
+
+    APP_INSTALLED=1
+}
+
+# NOTE: deliberately there is no "exit 0"

src/freedombone-app-scuttlebot

@@ -369,6 +369,7 @@ function mesh_install_scuttlebot {
     cat <<EOF > $rootdir/usr/bin/install_scuttlebot
 #!/bin/bash
 npm install --arch=$NPM_ARCH -g scuttlebot@${SCUTTLEBOT_VERSION}
+npm install --arch=$NPM_ARCH -g dat
 npm install --arch=$NPM_ARCH -g git-ssb
 npm install --arch=$NPM_ARCH -g git-remote-ssb
 EOF
@@ -419,6 +420,7 @@ function install_scuttlebot {
         exit 528253
     fi
 
+    npm install -g dat
     npm install -g git-ssb
     npm install -g git-remote-ssb
 

src/freedombone-app-xmpp

@@ -375,6 +375,17 @@ function update_prosody_modules {
     fi
 }
 
+function prosody_daemon_restart_script {
+    # On rare occasions the daemon appears to get stuck
+    # i.e. still active, but not accepting connections
+    # This ensures that it will unstick itself at least once per day
+    if [ ! -f /etc/cron.daily/prosody ]; then
+        echo '#!/bin/bash' > /etc/cron.daily/prosody
+        echo 'systemctl restart prosody' >> /etc/cron.daily/prosody
+        chmod +x /etc/cron.daily/prosody
+    fi
+}
+
 function upgrade_xmpp {
     if [ -d /etc/letsencrypt ]; then
         prosody_groups=$(groups prosody)
@@ -382,6 +393,7 @@ function upgrade_xmpp {
             usermod -a -G ssl-cert prosody
         fi
     fi
+    prosody_daemon_restart_script
     function_check update_prosody_modules
     update_prosody_modules
     xmpp_onion_addresses /etc/prosody/prosody.cfg.lua
@@ -544,6 +556,7 @@ function remove_xmpp {
     remove_onion_service xmpp 5222 5223 5269
 
     apt-get -yq remove --purge prosody
+    rm /etc/cron.daily/prosody
     if [ -f $INSTALL_DIR/$prosody_modules_filename ]; then
         rm $INSTALL_DIR/$prosody_modules_filename
     fi
@@ -1059,6 +1072,8 @@ function install_xmpp {
         exit 347682
     fi
 
+    prosody_daemon_restart_script
+
     ${PROJECT_NAME}-pass -u $MY_USERNAME -a xmpp -p "$XMPP_PASSWORD"
 
     APP_INSTALLED=1

src/freedombone-image

@@ -160,10 +160,12 @@ function image_setup {
 
     case $setup_type in
         debian|ubuntu|trisquel|mint)
+            sudo apt-get -yq remove vmdebootstrap
             sudo apt-get -yq install build-essential libc6-dev-i386 gcc-multilib g++-multilib
-            sudo apt-get -yq install git python-docutils mktorrent vmdebootstrap xz-utils
+            sudo apt-get -yq install git python-docutils mktorrent xz-utils debootstrap
             sudo apt-get -yq install dosfstools btrfs-tools extlinux python-distro-info mbr
             sudo apt-get -yq install qemu-user-static binfmt-support u-boot-tools qemu
+            freedombone-image-vmdebootstrap
             ;;
         parabola|arch)
             sudo pacman -S --noconfirm libc++ git gcc gcc-libs python-docutils mktorrent patch

src/freedombone-utils-web

@@ -976,6 +976,9 @@ function install_composer {
             cat /home/$MY_USERNAME/${PROJECT_NAME}/image_build/composer_install | php
         fi
     fi
+    if [ -f composer.phar ]; then
+        cp composer.phar composer
+    fi
     php composer.phar install
     if [ ! "$?" = "0" ]; then
         echo $'Unable to run composer install'

website/EN/app_akaunting.html

@@ -0,0 +1,334 @@
+<?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>
+<!-- 2017-12-20 Wed 23:39 -->
+<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 Akaunting"
+ />
+<meta name="keywords" content="freedombone, akaunting" />
+<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>Akaunting</h1>
+</center>
+
+<p>
+The Freedombone system isn't primarily aimed at companies or institutions, but if you're a one person company or freelancer then having the ability to run your own accounting system and keep the data private and also backed up is useful. Akaunting provides a nice web based system for small business accounts, and is also quite usable within a mobile web browser.
+</p>
+
+<div id="outline-container-orgaea21b7" class="outline-2">
+<h2 id="orgaea21b7">Installation</h2>
+<div class="outline-text-2" id="text-orgaea21b7">
+<p>
+Log into your system with:
+</p>
+
+<div class="org-src-container">
+<pre class="src src-bash">ssh myusername@mydomain -p 2222
+</pre>
+</div>
+
+<p>
+Using cursor keys, space bar and Enter key select <b>Administrator controls</b> and type in your password.
+</p>
+
+<p>
+Select <b>Add/Remove Apps</b> then <b>akaunting</b>. Enter the subdomain that you which to use, such as <b>accounts.mydomain.net</b>, and optionally a FreeDNS code.
+</p>
+
+<p>
+From the <b>Administrator control panel</b> select <b>Passwords</b> and look up the password for <b>mariadb</b>.
+</p>
+
+<p>
+Now in a browser navigate to your subdomain. You will need to enter some details for the database. The password should be the mariadb one.
+</p>
+
+<div class="org-center">
+
+<div class="figure">
+<p><img src="images/akaunting_setup.jpg" alt="akaunting_setup.jpg" />
+</p>
+</div>
+</div>
+
+<p>
+After that you'll need to enter a company name and an email address. You can make the administrator password anything you prefer, and a suggestion can be found within the <b>Passwords</b> section of the <b>Administrator control panel</b> under <b>akaunting</b>.
+</p>
+
+<div class="org-center">
+
+<div class="figure">
+<p><img src="images/akaunting_setup_company.jpg" alt="akaunting_setup_company.jpg" />
+</p>
+</div>
+</div>
+
+<p>
+From then on the system should be usable. Accounts software can often be quite complex, and so you'll probably want to refer to the <a href="https://akaunting.com/docs">official documentation</a> for details.
+</p>
+</div>
+</div>
+</div>
+<div id="postamble" class="status">
+
+<style type="text/css">
+.back-to-top {
+    position: fixed;
+    bottom: 2em;
+    right: 0px;
+    text-decoration: none;
+    color: #000000;
+    background-color: rgba(235, 235, 235, 0.80);
+    font-size: 12px;
+    padding: 1em;
+    display: none;
+}
+
+.back-to-top:hover {
+    background-color: rgba(135, 135, 135, 0.50);
+}
+</style>
+
+<div class="back-to-top">
+<a href="#top">Back to top</a> | <a href="mailto:bob@freedombone.net">E-mail me</a>
+</div>
+</div>
+</body>
+</html>

website/EN/apps.html

@@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2017-12-01 Fri 10:19 -->
+<!-- 2017-12-20 Wed 23:36 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>&lrm;</title>
@@ -264,9 +264,22 @@ The base install of the system just contains an email server and Mutt client, bu
 </div>
 </div>
 
-<div id="outline-container-orgf8331ba" class="outline-2">
-<h2 id="orgf8331ba">CryptPad</h2>
-<div class="outline-text-2" id="text-orgf8331ba">
+
+<div id="outline-container-org351bae6" class="outline-2">
+<h2 id="org351bae6">Akaunting</h2>
+<div class="outline-text-2" id="text-org351bae6">
+<p>
+A web based accounts system for small businesses or freelancers.
+</p>
+
+<p>
+<a href="./app_akaunting.html">How to use it</a>
+</p>
+</div>
+</div>
+<div id="outline-container-orge2d6b13" class="outline-2">
+<h2 id="orge2d6b13">CryptPad</h2>
+<div class="outline-text-2" id="text-orge2d6b13">
 <p>
 Collaborate on editing documents, presentations and source code, or vote on things. All with a good level of security.
 </p>
@@ -276,9 +289,9 @@ Collaborate on editing documents, presentations and source code, or vote on thin
 </p>
 </div>
 </div>
-<div id="outline-container-orgca21c4d" class="outline-2">
-<h2 id="orgca21c4d">DLNA</h2>
-<div class="outline-text-2" id="text-orgca21c4d">
+<div id="outline-container-org8762555" class="outline-2">
+<h2 id="org8762555">DLNA</h2>
+<div class="outline-text-2" id="text-org8762555">
 <p>
 Enables you to use the system as a music server which any DLNA compatible devices can connect to within your home network.
 </p>
@@ -288,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-org6f48ecb" class="outline-2">
-<h2 id="org6f48ecb">Dokuwiki</h2>
-<div class="outline-text-2" id="text-org6f48ecb">
+<div id="outline-container-orgeb82d0e" class="outline-2">
+<h2 id="orgeb82d0e">Dokuwiki</h2>
+<div class="outline-text-2" id="text-orgeb82d0e">
 <p>
 A databaseless wiki system.
 </p>
@@ -300,9 +313,9 @@ A databaseless wiki system.
 </p>
 </div>
 </div>
-<div id="outline-container-org312cd59" class="outline-2">
-<h2 id="org312cd59">Emacs</h2>
-<div class="outline-text-2" id="text-org312cd59">
+<div id="outline-container-orgd08f244" class="outline-2">
+<h2 id="orgd08f244">Emacs</h2>
+<div class="outline-text-2" id="text-orgd08f244">
 <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>
@@ -312,9 +325,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-org631741c" class="outline-2">
-<h2 id="org631741c">Etherpad</h2>
-<div class="outline-text-2" id="text-org631741c">
+<div id="outline-container-orgae371e7" class="outline-2">
+<h2 id="orgae371e7">Etherpad</h2>
+<div class="outline-text-2" id="text-orgae371e7">
 <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>
@@ -324,9 +337,9 @@ Collaborate on creating documents in real time. Maybe you're planning a holiday
 </p>
 </div>
 </div>
-<div id="outline-container-orgdeda776" class="outline-2">
-<h2 id="orgdeda776">Friendica</h2>
-<div class="outline-text-2" id="text-orgdeda776">
+<div id="outline-container-org4300e45" class="outline-2">
+<h2 id="org4300e45">Friendica</h2>
+<div class="outline-text-2" id="text-org4300e45">
 <p>
 Federated social network system.
 </p>
@@ -336,9 +349,9 @@ Federated social network system.
 </p>
 </div>
 </div>
-<div id="outline-container-orgbedc668" class="outline-2">
-<h2 id="orgbedc668">Ghost</h2>
-<div class="outline-text-2" id="text-orgbedc668">
+<div id="outline-container-org8cae058" class="outline-2">
+<h2 id="org8cae058">Ghost</h2>
+<div class="outline-text-2" id="text-org8cae058">
 <p>
 Modern looking blogging system.
 </p>
@@ -348,9 +361,9 @@ Modern looking blogging system.
 </p>
 </div>
 </div>
-<div id="outline-container-org43b36ad" class="outline-2">
-<h2 id="org43b36ad">GNU Social</h2>
-<div class="outline-text-2" id="text-org43b36ad">
+<div id="outline-container-org52c14c7" class="outline-2">
+<h2 id="org52c14c7">GNU Social</h2>
+<div class="outline-text-2" id="text-org52c14c7">
 <p>
 Federated social network based on the OStatus protocol. You can "<i>remote follow</i>" other users within the GNU Social federation.
 </p>
@@ -360,9 +373,9 @@ Federated social network based on the OStatus protocol. You can "<i>remote follo
 </p>
 </div>
 </div>
-<div id="outline-container-orgd452cf4" class="outline-2">
-<h2 id="orgd452cf4">Gogs</h2>
-<div class="outline-text-2" id="text-orgd452cf4">
+<div id="outline-container-org1bb5d47" class="outline-2">
+<h2 id="org1bb5d47">Gogs</h2>
+<div class="outline-text-2" id="text-org1bb5d47">
 <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>
@@ -372,9 +385,9 @@ Lightweight git project hosting system. You can mirror projects from Github, or
 </p>
 </div>
 </div>
-<div id="outline-container-orgb5de05c" class="outline-2">
-<h2 id="orgb5de05c">HTMLy</h2>
-<div class="outline-text-2" id="text-orgb5de05c">
+<div id="outline-container-orgff3e945" class="outline-2">
+<h2 id="orgff3e945">HTMLy</h2>
+<div class="outline-text-2" id="text-orgff3e945">
 <p>
 Databaseless blogging system. Quite simple and with a markdown-like format.
 </p>
@@ -384,9 +397,9 @@ Databaseless blogging system. Quite simple and with a markdown-like format.
 </p>
 </div>
 </div>
-<div id="outline-container-org3a9c19a" class="outline-2">
-<h2 id="org3a9c19a">Hubzilla</h2>
-<div class="outline-text-2" id="text-org3a9c19a">
+<div id="outline-container-orgdc01553" class="outline-2">
+<h2 id="orgdc01553">Hubzilla</h2>
+<div class="outline-text-2" id="text-orgdc01553">
 <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>
@@ -396,9 +409,9 @@ Web publishing platform with social network like features and good privacy contr
 </p>
 </div>
 </div>
-<div id="outline-container-org8953dcb" class="outline-2">
-<h2 id="org8953dcb">Icecast media stream</h2>
-<div class="outline-text-2" id="text-org8953dcb">
+<div id="outline-container-orgea26aa5" class="outline-2">
+<h2 id="orgea26aa5">Icecast media stream</h2>
+<div class="outline-text-2" id="text-orgea26aa5">
 <p>
 Make your own internet radio station.
 </p>
@@ -408,9 +421,9 @@ Make your own internet radio station.
 </p>
 </div>
 </div>
-<div id="outline-container-org26745fc" class="outline-2">
-<h2 id="org26745fc">IRC Server (ngirc)</h2>
-<div class="outline-text-2" id="text-org26745fc">
+<div id="outline-container-orgd35f348" class="outline-2">
+<h2 id="orgd35f348">IRC Server (ngirc)</h2>
+<div class="outline-text-2" id="text-orgd35f348">
 <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>
@@ -420,18 +433,18 @@ Run your own IRC chat channel which can be secured with a password and accessibl
 </p>
 </div>
 </div>
-<div id="outline-container-orgb904691" class="outline-2">
-<h2 id="orgb904691">Jitsi Meet</h2>
-<div class="outline-text-2" id="text-orgb904691">
+<div id="outline-container-org6a1a594" class="outline-2">
+<h2 id="org6a1a594">Jitsi Meet</h2>
+<div class="outline-text-2" id="text-org6a1a594">
 <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-org7b034bc" class="outline-2">
-<h2 id="org7b034bc">KanBoard</h2>
-<div class="outline-text-2" id="text-org7b034bc">
+<div id="outline-container-org1ee358e" class="outline-2">
+<h2 id="org1ee358e">KanBoard</h2>
+<div class="outline-text-2" id="text-org1ee358e">
 <p>
 A simple kanban system for managing projects or TODO lists.
 </p>
@@ -441,9 +454,9 @@ A simple kanban system for managing projects or TODO lists.
 </p>
 </div>
 </div>
-<div id="outline-container-org1c65b4a" class="outline-2">
-<h2 id="org1c65b4a">Key Server</h2>
-<div class="outline-text-2" id="text-org1c65b4a">
+<div id="outline-container-orge30d805" class="outline-2">
+<h2 id="orge30d805">Key Server</h2>
+<div class="outline-text-2" id="text-orge30d805">
 <p>
 An OpenPGP key server for storing and retrieving GPG public keys.
 </p>
@@ -453,9 +466,9 @@ An OpenPGP key server for storing and retrieving GPG public keys.
 </p>
 </div>
 </div>
-<div id="outline-container-org0cbbb3a" class="outline-2">
-<h2 id="org0cbbb3a">Koel</h2>
-<div class="outline-text-2" id="text-org0cbbb3a">
+<div id="outline-container-org240e85f" class="outline-2">
+<h2 id="org240e85f">Koel</h2>
+<div class="outline-text-2" id="text-org240e85f">
 <p>
 Access your music collection from any internet connected device.
 </p>
@@ -465,9 +478,9 @@ Access your music collection from any internet connected device.
 </p>
 </div>
 </div>
-<div id="outline-container-orgd9ad54f" class="outline-2">
-<h2 id="orgd9ad54f">Lychee</h2>
-<div class="outline-text-2" id="text-orgd9ad54f">
+<div id="outline-container-orgb81a1c2" class="outline-2">
+<h2 id="orgb81a1c2">Lychee</h2>
+<div class="outline-text-2" id="text-orgb81a1c2">
 <p>
 Make your photo albums available on the web.
 </p>
@@ -477,9 +490,9 @@ Make your photo albums available on the web.
 </p>
 </div>
 </div>
-<div id="outline-container-orge6a1bee" class="outline-2">
-<h2 id="orge6a1bee">Mailpile</h2>
-<div class="outline-text-2" id="text-orge6a1bee">
+<div id="outline-container-org1ad9b1b" class="outline-2">
+<h2 id="org1ad9b1b">Mailpile</h2>
+<div class="outline-text-2" id="text-org1ad9b1b">
 <p>
 Modern email client which supports GPG encryption.
 </p>
@@ -489,9 +502,9 @@ Modern email client which supports GPG encryption.
 </p>
 </div>
 </div>
-<div id="outline-container-org88a3c1b" class="outline-2">
-<h2 id="org88a3c1b">Matrix</h2>
-<div class="outline-text-2" id="text-org88a3c1b">
+<div id="outline-container-orgbb8fed1" class="outline-2">
+<h2 id="orgbb8fed1">Matrix</h2>
+<div class="outline-text-2" id="text-orgbb8fed1">
 <p>
 Multi-user chat with some security and moderation controls.
 </p>
@@ -501,9 +514,9 @@ Multi-user chat with some security and moderation controls.
 </p>
 </div>
 </div>
-<div id="outline-container-orgca43d7f" class="outline-2">
-<h2 id="orgca43d7f">Mediagoblin</h2>
-<div class="outline-text-2" id="text-orgca43d7f">
+<div id="outline-container-org264a933" class="outline-2">
+<h2 id="org264a933">Mediagoblin</h2>
+<div class="outline-text-2" id="text-org264a933">
 <p>
 Publicly host video and audio files so that you don't need to use YouTube/Vimeo/etc.
 </p>
@@ -513,9 +526,9 @@ Publicly host video and audio files so that you don't need to use YouTube/Vimeo/
 </p>
 </div>
 </div>
-<div id="outline-container-org8c5a11e" class="outline-2">
-<h2 id="org8c5a11e">Mumble</h2>
-<div class="outline-text-2" id="text-org8c5a11e">
+<div id="outline-container-org5f27565" class="outline-2">
+<h2 id="org5f27565">Mumble</h2>
+<div class="outline-text-2" id="text-org5f27565">
 <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>
@@ -525,9 +538,9 @@ The popular VoIP and text chat system. Say goodbye to old-fashioned telephony co
 </p>
 </div>
 </div>
-<div id="outline-container-org4a26fd8" class="outline-2">
-<h2 id="org4a26fd8">NextCloud</h2>
-<div class="outline-text-2" id="text-org4a26fd8">
+<div id="outline-container-org532c52b" class="outline-2">
+<h2 id="org532c52b">NextCloud</h2>
+<div class="outline-text-2" id="text-org532c52b">
 <p>
 Store files on your server and sync them with laptops or mobile devices. Includes many plugins including videoconferencing and collaborative document editing.
 </p>
@@ -537,9 +550,9 @@ Store files on your server and sync them with laptops or mobile devices. Include
 </p>
 </div>
 </div>
-<div id="outline-container-orgda0e181" class="outline-2">
-<h2 id="orgda0e181">PeerTube</h2>
-<div class="outline-text-2" id="text-orgda0e181">
+<div id="outline-container-org9067728" class="outline-2">
+<h2 id="org9067728">PeerTube</h2>
+<div class="outline-text-2" id="text-org9067728">
 <p>
 Peer-to-peer video hosting. Similar to Mediagoblin, but the P2P aspect better enables the streaming load to be shared across servers.
 </p>
@@ -549,9 +562,9 @@ Peer-to-peer video hosting. Similar to Mediagoblin, but the P2P aspect better en
 </p>
 </div>
 </div>
-<div id="outline-container-orgfdd0292" class="outline-2">
-<h2 id="orgfdd0292">PI-Hole</h2>
-<div class="outline-text-2" id="text-orgfdd0292">
+<div id="outline-container-orgf62f97e" class="outline-2">
+<h2 id="orgf62f97e">PI-Hole</h2>
+<div class="outline-text-2" id="text-orgf62f97e">
 <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>
@@ -561,9 +574,9 @@ The black hole for web adverts. Block adverts at the domain name level within yo
 </p>
 </div>
 </div>
-<div id="outline-container-orga14f200" class="outline-2">
-<h2 id="orga14f200">Pleroma</h2>
-<div class="outline-text-2" id="text-orga14f200">
+<div id="outline-container-orgdb42e0c" class="outline-2">
+<h2 id="orgdb42e0c">Pleroma</h2>
+<div class="outline-text-2" id="text-orgdb42e0c">
 <p>
 Pleroma is an OStatus-compatible social networking server, compatible with GNU Social, PostActiv and Mastodon. It is high-performance and so is especially well suited for running on low power single board computers without much RAM.
 </p>
@@ -573,9 +586,9 @@ Pleroma is an OStatus-compatible social networking server, compatible with GNU S
 </p>
 </div>
 </div>
-<div id="outline-container-org5e17da3" class="outline-2">
-<h2 id="org5e17da3">PostActiv</h2>
-<div class="outline-text-2" id="text-org5e17da3">
+<div id="outline-container-org13c41ff" class="outline-2">
+<h2 id="org13c41ff">PostActiv</h2>
+<div class="outline-text-2" id="text-org13c41ff">
 <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>
@@ -585,9 +598,9 @@ An alternative federated social networking system compatible with GNU Social, Pl
 </p>
 </div>
 </div>
-<div id="outline-container-org517a50e" class="outline-2">
-<h2 id="org517a50e">Profanity</h2>
-<div class="outline-text-2" id="text-org517a50e">
+<div id="outline-container-org2eaba6a" class="outline-2">
+<h2 id="org2eaba6a">Profanity</h2>
+<div class="outline-text-2" id="text-org2eaba6a">
 <p>
 A shell based XMPP client which you can run on the Freedombone server via ssh.
 </p>
@@ -597,9 +610,9 @@ A shell based XMPP client which you can run on the Freedombone server via ssh.
 </p>
 </div>
 </div>
-<div id="outline-container-org0c8c8d9" class="outline-2">
-<h2 id="org0c8c8d9">Riot Web</h2>
-<div class="outline-text-2" id="text-org0c8c8d9">
+<div id="outline-container-org201d591" class="outline-2">
+<h2 id="org201d591">Riot Web</h2>
+<div class="outline-text-2" id="text-org201d591">
 <p>
 A browser based user interface for the Matrix federated communications system, including WebRTC audio and video chat.
 </p>
@@ -609,9 +622,9 @@ A browser based user interface for the Matrix federated communications system, i
 </p>
 </div>
 </div>
-<div id="outline-container-org0901ef0" class="outline-2">
-<h2 id="org0901ef0">SearX</h2>
-<div class="outline-text-2" id="text-org0901ef0">
+<div id="outline-container-org46bc137" class="outline-2">
+<h2 id="org46bc137">SearX</h2>
+<div class="outline-text-2" id="text-org46bc137">
 <p>
 A metasearch engine for customised and private web searches.
 </p>
@@ -621,9 +634,9 @@ A metasearch engine for customised and private web searches.
 </p>
 </div>
 </div>
-<div id="outline-container-org6403f0a" class="outline-2">
-<h2 id="org6403f0a">tt-rss</h2>
-<div class="outline-text-2" id="text-org6403f0a">
+<div id="outline-container-org8fff378" class="outline-2">
+<h2 id="org8fff378">tt-rss</h2>
+<div class="outline-text-2" id="text-org8fff378">
 <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>
@@ -633,9 +646,9 @@ Private RSS reader. Pulls in RSS/Atom feeds via Tor and is only accessible via a
 </p>
 </div>
 </div>
-<div id="outline-container-orgdeec7a4" class="outline-2">
-<h2 id="orgdeec7a4">Syncthing</h2>
-<div class="outline-text-2" id="text-orgdeec7a4">
+<div id="outline-container-org932f267" class="outline-2">
+<h2 id="org932f267">Syncthing</h2>
+<div class="outline-text-2" id="text-org932f267">
 <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>
@@ -645,9 +658,9 @@ Possibly the best way to synchronise files across all of your devices. Once it h
 </p>
 </div>
 </div>
-<div id="outline-container-org5a6843f" class="outline-2">
-<h2 id="org5a6843f">Tahoe-LAFS</h2>
-<div class="outline-text-2" id="text-org5a6843f">
+<div id="outline-container-orgba7f3d8" class="outline-2">
+<h2 id="orgba7f3d8">Tahoe-LAFS</h2>
+<div class="outline-text-2" id="text-orgba7f3d8">
 <p>
 Robust and encrypted storage of files on one or more server.
 </p>
@@ -657,9 +670,9 @@ Robust and encrypted storage of files on one or more server.
 </p>
 </div>
 </div>
-<div id="outline-container-org4e08973" class="outline-2">
-<h2 id="org4e08973">Tox</h2>
-<div class="outline-text-2" id="text-org4e08973">
+<div id="outline-container-org9a4f66a" class="outline-2">
+<h2 id="org9a4f66a">Tox</h2>
+<div class="outline-text-2" id="text-org9a4f66a">
 <p>
 Client and bootstrap node for the Tox chat/VoIP system.
 </p>
@@ -669,9 +682,9 @@ Client and bootstrap node for the Tox chat/VoIP system.
 </p>
 </div>
 </div>
-<div id="outline-container-orgd3b3f1e" class="outline-2">
-<h2 id="orgd3b3f1e">Turtl</h2>
-<div class="outline-text-2" id="text-orgd3b3f1e">
+<div id="outline-container-org94d43e3" class="outline-2">
+<h2 id="org94d43e3">Turtl</h2>
+<div class="outline-text-2" id="text-org94d43e3">
 <p>
 A system for privately creating and sharing notes and images, similar to Evernote but without the spying.
 </p>
@@ -681,18 +694,18 @@ A system for privately creating and sharing notes and images, similar to Evernot
 </p>
 </div>
 </div>
-<div id="outline-container-org823c7ff" class="outline-2">
-<h2 id="org823c7ff">Vim</h2>
-<div class="outline-text-2" id="text-org823c7ff">
+<div id="outline-container-org46fcb91" class="outline-2">
+<h2 id="org46fcb91">Vim</h2>
+<div class="outline-text-2" id="text-org46fcb91">
 <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-org3535c47" class="outline-2">
-<h2 id="org3535c47">Virtual Private Network (VPN)</h2>
-<div class="outline-text-2" id="text-org3535c47">
+<div id="outline-container-org867a756" class="outline-2">
+<h2 id="org867a756">Virtual Private Network (VPN)</h2>
+<div class="outline-text-2" id="text-org867a756">
 <p>
 Set up a VPN on your server so that you can bypass local internet censorship.
 </p>
@@ -702,9 +715,9 @@ Set up a VPN on your server so that you can bypass local internet censorship.
 </p>
 </div>
 </div>
-<div id="outline-container-orgaadabb5" class="outline-2">
-<h2 id="orgaadabb5">XMPP</h2>
-<div class="outline-text-2" id="text-orgaadabb5">
+<div id="outline-container-orge4cd08a" class="outline-2">
+<h2 id="orge4cd08a">XMPP</h2>
+<div class="outline-text-2" id="text-orge4cd08a">
 <p>
 Chat server which can be used together with client such as Gajim or Conversations to provide end-to-end content security and also onion routed metadata security. Includes advanced features such as <i>client state notification</i> to save battery power on your mobile devices, support for seamless roaming between networks and <i>message carbons</i> so that you can receive the same messages while being simultaneously logged in to your account on more than one device.
 </p>

website/EN/index.html

@@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2017-12-20 Wed 12:40 -->
+<!-- 2017-12-20 Wed 13:53 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>&lrm;</title>
@@ -290,7 +290,7 @@ After installation it's possible that you might want some advice on how to run y
 </ul>
 
 <p>
-If you find bugs, or want to add a new app to this system see the <a href="./devguide.html">Developers Guide</a> and <a href="./codeofconduct.html">Code of Conduct</a>.
+If you find bugs, or want to add a new app to this system see the <a href="./devguide.html">Developers Guide</a> and <a href="./codeofconduct.html">Code of Conduct</a>. There is a Matrix chat room available at <b>#fbone:matrix.freedombone.net</b>.
 </p>
 
 <p>

website/EN/mobile.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>
-<!-- 2017-11-19 Sun 23:19 -->
+<!-- 2017-12-20 Wed 14:32 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>&lrm;</title>
@@ -256,7 +256,7 @@ Mobile phones are insecure devices, but they're regarded as being so essential t
  <table style="width:80%; border:0">
   <tr>
     <td><center><b><h3>Open</h3></b><br>Use a free and open source operating system. Open means more trustworthy</center></td>
-    <td><center><b><h3>Remove</h3></b><br>If there are any proprietary apps then remove or deactivete them</center></td>
+    <td><center><b><h3>Remove</h3></b><br>If there are any proprietary apps then remove or deactivate them</center></td>
   </tr>
   <tr>
     <td><center><b><h3>Encrypt</h3></b><br>Make sure your phone is encrypted with a password which isn't easy to guess</center></td>
@@ -277,9 +277,9 @@ Mobile phones are insecure devices, but they're regarded as being so essential t
 </table>
 </center>
 
-<div id="outline-container-org028bfb1" class="outline-2">
-<h2 id="org028bfb1">Open</h2>
-<div class="outline-text-2" id="text-org028bfb1">
+<div id="outline-container-orgd7b8f2c" class="outline-2">
+<h2 id="orgd7b8f2c">Open</h2>
+<div class="outline-text-2" id="text-orgd7b8f2c">
 <p>
 Use a Linux based phone operating system. Typically this will mean Android, but could also mean LineageOS or Replicant. LineageOS is the most preferable, because you can usually get an up to date image with a recent kernel which will give you better security against exploits. If you're buying a phone then look for a model which is supported by LineageOS. Replicant is the most free (as in freedom) but only runs on a small number of phone models. If you have a phone which runs a full GNU/Linux system then that's fantastic, and you can probably use it in much the same way as a desktop system and the rest of the advice on this page won't apply. If you don't have a phone capable of running a Linux based operating system then consider selling, giving away or bartering your existing one.
 </p>
@@ -290,45 +290,45 @@ Why is it so important to run Linux on a phone? Aren't <i>iThings</i> supposed t
 </div>
 </div>
 
-<div id="outline-container-orgf5a1356" class="outline-2">
-<h2 id="orgf5a1356">Remove</h2>
-<div class="outline-text-2" id="text-orgf5a1356">
+<div id="outline-container-org050f512" class="outline-2">
+<h2 id="org050f512">Remove</h2>
+<div class="outline-text-2" id="text-org050f512">
 <p>
 So maybe you're running Android and the phone came with some apps already installed. Almost certainly they'll be proprietary. Go to Settings/Apps and then uninstall or deactivate any apps which you really don't need. Mostly preinstalled apps are intended to send your data to companies who will then sell it to advertisers or governments under the business model of <i>surveillance capital</i>. It's not a good idea to get caught up in that, and to avoid becoming addicted to apps which are surveilling you without consent or installing spyware in the background without your knowledge.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org8f0466d" class="outline-2">
-<h2 id="org8f0466d">Encrypt</h2>
-<div class="outline-text-2" id="text-org8f0466d">
+<div id="outline-container-org29f4fb3" class="outline-2">
+<h2 id="org29f4fb3">Encrypt</h2>
+<div class="outline-text-2" id="text-org29f4fb3">
 <p>
 Encrypt your phone. This can usually be done via <b>Settings/Security</b> and you may need to fully charge the phone first. Encryption means that if you lose your phone or it gets stolen then there is less chance that anyone who picks it up will get access to your data, photos and so on.
 </p>
 </div>
 </div>
 
-<div id="outline-container-orgfec183a" class="outline-2">
-<h2 id="orgfec183a">Apps</h2>
-<div class="outline-text-2" id="text-orgfec183a">
+<div id="outline-container-orgd8e9683" class="outline-2">
+<h2 id="orgd8e9683">Apps</h2>
+<div class="outline-text-2" id="text-orgd8e9683">
 <p>
 Installing <b>F-droid</b> and only adding any new apps via F-droid will ensure that you are always using free and open source software. Open source is not a panacea, since bugs can and do still occur, but it will help you to avoid the worst security and privacy pitfalls.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org77de138" class="outline-2">
-<h2 id="org77de138">Lock</h2>
-<div class="outline-text-2" id="text-org77de138">
+<div id="outline-container-orgcf9fd9c" class="outline-2">
+<h2 id="orgcf9fd9c">Lock</h2>
+<div class="outline-text-2" id="text-orgcf9fd9c">
 <p>
 Add a lock screen, preferably with a password which is not easy for other people to guess or for quicker access with a PIN number. Install an app called <b>Locker</b>, activate it and set the maximum number of password guesses to ten (or whatever you feel comfortable with). If bad people get hold of your phone then they may try to brute force your lock screen password or PIN (i.e. automatically trying millions of common word and number combinations) and the locker app will prevent them from succeeding by resetting the phone back to its factory default condition and wiping the data.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org4dc0e5b" class="outline-2">
-<h2 id="org4dc0e5b">Onion</h2>
-<div class="outline-text-2" id="text-org4dc0e5b">
+<div id="outline-container-orgae1898b" class="outline-2">
+<h2 id="orgae1898b">Onion</h2>
+<div class="outline-text-2" id="text-orgae1898b">
 <p>
 Both governments and corporations want to compile matadata dossiers about you. Who you communicated with, when and how often. They want this so that they can data mine, simulate, predict and then ultimately influence (sometimes also called "nudge") your actions and preferences in the directions they prefer. By routing your connections through a number of proxy servers (Tor routers) you can make it perhaps not <i>theoretically</i> impossible but at least <i>very hard</i> for them to have a complete and accurate list of who your friends are, your religion, politics, likely health issues, sexual orientation and what news sites or books you read.
 </p>
@@ -339,26 +339,26 @@ In F-droid under the <b>repositories</b> menu you can enable the <b>guardian pro
 </div>
 </div>
 
-<div id="outline-container-org466eb29" class="outline-2">
-<h2 id="org466eb29">Email</h2>
-<div class="outline-text-2" id="text-org466eb29">
+<div id="outline-container-org6b540e5" class="outline-2">
+<h2 id="org6b540e5">Email</h2>
+<div class="outline-text-2" id="text-org6b540e5">
 <p>
 The easiest way to access email is by installing the <a href="./app_mailpile.html">Mailpile</a> app. This keeps your GPG keys off of possibly insecure mobile devices but still enables encrypted email communications in an easy way. You can use K9 mail if you prefer, but that will require installing OpenKeychain and having your GPG keys on the device, which is a lot more risky.
 </p>
 </div>
 </div>
-<div id="outline-container-org978ea8b" class="outline-2">
-<h2 id="org978ea8b">Services</h2>
-<div class="outline-text-2" id="text-org978ea8b">
+<div id="outline-container-org62a2756" class="outline-2">
+<h2 id="org62a2756">Services</h2>
+<div class="outline-text-2" id="text-org62a2756">
 <p>
 For information on configuring various apps to work with Freedombone see the <a href="./usage.html">usage section</a>. Also see advice on chat apps in the <a href="./faq.html">FAQ</a>.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org3546225" class="outline-2">
-<h2 id="org3546225">Battery preservation</h2>
-<div class="outline-text-2" id="text-org3546225">
+<div id="outline-container-org59a272b" class="outline-2">
+<h2 id="org59a272b">Battery preservation</h2>
+<div class="outline-text-2" id="text-org59a272b">
 <p>
 Even with free software apps it's not difficult to get into a situation where your battery doesn't last for long. To maximize battery life access RSS feeds via the onion-based mobile reader within a Tor-compatible browser and not from a locally installed RSS app.
 </p>
@@ -373,9 +373,9 @@ If you're using the Riot mobile app to access a Matrix homeserver then you can s
 </div>
 </div>
 
-<div id="outline-container-org6ebc6c4" class="outline-2">
-<h2 id="org6ebc6c4">Blocking bad domains</h2>
-<div class="outline-text-2" id="text-org6ebc6c4">
+<div id="outline-container-org56572e8" class="outline-2">
+<h2 id="org56572e8">Blocking bad domains</h2>
+<div class="outline-text-2" id="text-org56572e8">
 <p>
 You can block known bad domains by editing the <b>/system/etc/hosts</b> file on your device. It is possible to use extensive ad-blocking hosts files used by other ad-blocking systems such as pi-hole, but merely blocking Facebook and Google Analytics will protect you against much of the corporate surveillance which goes on. Even if you don't have a Facebook account this may still be useful since they will still try to create a "ghost profile" of you, so the less data they have the better.
 </p>