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

doc/EN/app_pleroma.org

@@ -14,7 +14,13 @@
 [[file:images/pleroma-logo.png]]
 #+END_CENTER
 
-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.
+#+BEGIN_QUOTE
+"/The way to keep giant companies from sterilizing the Internet is to make their sites irrelevant. If all the cool stuff happens elsewhere, people will follow. We did this with AOL and Prodigy, and we can do it again./" -- Maciej Cegłowski
+#+END_QUOTE
+
+Pleroma is an OStatus and ActivityPub 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.
+
+Some general advice about life in the fediverse [[./fediverse.html][can be found here]].
 
 #+BEGIN_CENTER
 [[file:images/pleroma.jpg]]
@@ -42,3 +48,12 @@ If you prefer a Tweetdeck-style user interface, similar to Mastodon, then once y
 #+BEGIN_CENTER
 [[file:images/pleromamastodon.jpg]]
 #+END_CENTER
+
+* Blocking controls
+#+BEGIN_CENTER
+[[file:images/controlpanel/control_panel_blocking.jpg]]
+#+END_CENTER
+
+The biggest hazard with Pleroma is that it's part of a public federated communications system. This means that conversations and replies from other servers may end up in your "whole known network" stream. The internet being what it is, some of these could be undesirable. You can block individual users or entire domains by going to the *Administrator control panel* and selecting *Domain or User Blocking*, then adding or removing entries. This blocks domains at the firewall level and also at the level of database and file storage.
+
+If you want to block a particular user then select *Block a domain or user* and enter the user in the format *username@domaintoblock* (similar to an email address).

doc/EN/apps.org

@@ -140,6 +140,10 @@ Peer-to-peer video hosting. Similar to Mediagoblin, but the P2P aspect better en
 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.
 
 [[./app_pihole.html][How to use it]]
+* Pleroma
+Fediverse instance which is compatible with GNU Social and Mastodon, and suited for systems without much RAM or CPU resource.
+
+[[./app_pleroma.html][How to use it]]
 * PostActiv
 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.
 

doc/EN/fediverse.org

@@ -18,6 +18,8 @@
 
 Some things you might want to know about the Fediverse:
 
+* Federation as a concept
+The political definition of a federation is "/a union of partially self-governing states or regions under a central (federal) government/". The fediverse isn't exactly like that, in that there is no federal government. However there are protocols which govern the communication between instances and that might be analogized to being a sort of elemantary constitution or mutual agreement binding all participants together. The protocols are merely ways of moving data around though, and don't impose any sort of moral code.
 * Keep the number of users on each server small
 The importance of this can't be overstated. Servers with lots of users always eventually have problems where the interests of the users are not the same as the interests of the server administrator. If you are the server administrator, or if there are only a small squad-size group of people on the server, then it's a lot easier to resolve differences and everyone's interests are likely to be similar.
 

src/freedombone-addcert

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-addemail

@@ -14,7 +14,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-addlist

@@ -14,7 +14,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-addremove

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-adduser

@@ -14,7 +14,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-addxmpp

@@ -1,100 +0,0 @@
-#!/bin/bash
-#
-# .---.                  .              .
-# |                      |              |
-# |--- .--. .-.  .-.  .-.|  .-. .--.--. |.-.  .-. .--.  .-.
-# |    |   (.-' (.-' (   | (   )|  |  | |   )(   )|  | (.-'
-# '    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'
-#
-#                    Freedom in the Cloud
-#
-
-# Adds an xmpp user
-
-# License
-# =======
-#
-# Copyright (C) 2015-2016 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/>.
-
-PROJECT_NAME='freedombone'
-
-export TEXTDOMAIN=${PROJECT_NAME}-addxmpp
-export TEXTDOMAINDIR="/usr/share/locale"
-
-EMAIL_ADDRESS=
-NEW_USER_PASSWORD=
-
-function show_help {
-    echo ''
-    echo $"${PROJECT_NAME}-addxmpp -e [email address] -p [password]"
-    echo ''
-    exit 0
-}
-
-while [[ $# > 1 ]]
-do
-    key="$1"
-
-    case $key in
-        -h|--help)
-            show_help
-            ;;
-        -e|--email)
-            shift
-            EMAIL_ADDRESS="$1"
-            ;;
-        -p|--password|--passphrase)
-            shift
-            NEW_USER_PASSWORD="$1"
-            ;;
-        *)
-            # unknown option
-            ;;
-    esac
-    shift
-done
-
-if [ ! -d /etc/prosody ]; then
-    echo $'xmpp server is not installed'
-    exit 0
-fi
-
-if [ ! $EMAIL_ADDRESS ]; then
-    show_help
-    exit 1
-fi
-
-USERNAME=$(echo $EMAIL_ADDRESS | awk -F '@' '{print $1}')
-if [ ! $NEW_USER_PASSWORD ]; then
-    prosodyctl adduser $EMAIL_ADDRESS
-else
-    DOMAIN_NAME=$(echo $EMAIL_ADDRESS | awk -F '@' '{print $2}')
-    prosodyctl register $USERNAME $DOMAIN_NAME "$NEW_USER_PASSWORD"
-    if [ ! "$?" = "0" ]; then
-        exit 2
-    fi
-fi
-
-# add the xmpp address to email headers
-if [ -f /home/$USERNAME/.muttrc ]; then
-    if ! grep -q "Jabber-ID" /home/$USERNAME/.muttrc; then
-        echo "my_hdr Jabber-ID: $EMAIL_ADDRESS" >> /home/$USERNAME/.muttrc
-    else
-        sed -i "s|my_hdr Jabber-ID.*|my_hdr Jabber-ID: $EMAIL_ADDRESS|g" /home/$USERNAME/.muttrc
-    fi
-fi
-
-exit 0

src/freedombone-app-batman

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-app-bdsmail

@@ -404,7 +404,7 @@ function install_bdsmail {
     chmod +x /usr/bin/bdsmail_distribute
 
     if ! grep -q 'bdsmail_distribute' /etc/crontab; then
-        echo '*/1            * *   *   *   root /usr/bin/bdsmail_distribute 2> /dev/null' >> /etc/crontab
+        cron_add_mins 1 '/usr/bin/bdsmail_distribute 2> /dev/null'
     fi
 
     echo '#!/bin/bash' > /usr/bin/bdsmail_domain

src/freedombone-app-dlna

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-app-emacs

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-app-htmly

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-app-icecast

@@ -105,7 +105,7 @@ function icecast_update_daemon {
     systemctl enable icecast2
 
     if ! grep -q "start_icecast" /etc/crontab; then
-        echo '*/1            * *   *   *   root /usr/bin/start_icecast > /dev/null' >> /etc/crontab
+        cron_add_mins 1 '/usr/bin/start_icecast 2> /dev/null'
     fi
 }
 

src/freedombone-app-ipfs

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-app-irc

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-app-mumble

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-app-pihole

@@ -16,7 +16,7 @@
 # License
 # =======
 #
-# Copyright (C) 2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2016-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

src/freedombone-app-pleroma

@@ -127,7 +127,7 @@ function create_pleroma_blocklist {
     chmod +x $blocking_script_file
 
     if ! grep -q "$blocking_script_file" /etc/crontab; then
-        echo "*/1            * *   *   *   root $blocking_script_file > /dev/null" >> /etc/crontab
+        cron_add_mins 1 "$blocking_script_file 2> /dev/null"
     fi
 }
 

src/freedombone-app-radicale

@@ -16,7 +16,7 @@
 # License
 # =======
 #
-# Copyright (C) 2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2016-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

src/freedombone-app-tox

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-app-turtl

@@ -16,7 +16,7 @@
 # License
 # =======
 #
-# Copyright (C) 2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2016-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

src/freedombone-app-vim

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2016-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

src/freedombone-app-xmpp

@@ -202,13 +202,14 @@ function configure_interactive_xmpp {
 
 function remove_user_xmpp {
     remove_username="$1"
-    ${PROJECT_NAME}-pass -u $remove_username --rmapp xmpp
-    XMPP_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_xmpp/hostname)
+
+    ${PROJECT_NAME}-pass -u "$remove_username" --rmapp xmpp
     if [[ $ONION_ONLY != "no" ]]; then
-        ${PROJECT_NAME}-rmxmpp -e "${remove_username}@${XMPP_ONION_HOSTNAME}"
+        DOMAIN=$(cat /var/lib/tor/hidden_service_xmpp/hostname)
     else
-        ${PROJECT_NAME}-rmxmpp -e "${remove_username}@${HOSTNAME}"
+        DOMAIN=${HOSTNAME}
     fi
+    prosodyctl deluser "${remove_username}@${DOMAIN}"
 }
 
 function add_user_xmpp_client {
@@ -271,16 +272,31 @@ function add_user_xmpp {
     new_user_password="$2"
 
     XMPP_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_xmpp/hostname)
-    ${PROJECT_NAME}-pass -u $new_username -a xmpp -p "$new_user_password"
+    ${PROJECT_NAME}-pass -u "$new_username" -a xmpp -p "$new_user_password"
 
     if [[ $ONION_ONLY != "no" ]]; then
-        ${PROJECT_NAME}-addxmpp -e "$new_username@$XMPP_ONION_HOSTNAME" -p "$new_user_password"
+        DOMAIN_NAME=$XMPP_ONION_HOSTNAME
     else
-        ${PROJECT_NAME}-addxmpp -e "$new_username@$HOSTNAME" -p "$new_user_password"
+        DOMAIN_NAME=$HOSTNAME
     fi
-    if [ ! "$?" = "0" ]; then
-        echo '1'
-        return
+    EMAIL_ADDRESS="$new_username@$DOMAIN_NAME"
+
+    if [ ${#new_user_password} -eq 0 ]; then
+        prosodyctl adduser $EMAIL_ADDRESS
+    else
+        prosodyctl register "$new_username" $DOMAIN_NAME "$new_user_password"
+        if [ ! "$?" = "0" ]; then
+            exit 653456375
+        fi
+    fi
+
+    # add the xmpp address to email headers
+    if [ -f /home/$new_username/.muttrc ]; then
+        if ! grep -q "Jabber-ID" /home/$new_username/.muttrc; then
+            echo "my_hdr Jabber-ID: $EMAIL_ADDRESS" >> /home/$new_username/.muttrc
+        else
+            sed -i "s|my_hdr Jabber-ID.*|my_hdr Jabber-ID: $EMAIL_ADDRESS|g" /home/$new_username/.muttrc
+        fi
     fi
 
     add_user_xmpp_client "$new_username" "$new_user_password"

src/freedombone-app-zeronet

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-archive-mail

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-base-tripwire

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-client

@@ -11,7 +11,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-clientcert

@@ -17,7 +17,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-dhparam

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-encrypt-mail

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-format

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-ignore

@@ -15,7 +15,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-image

@@ -15,7 +15,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-logging

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-mesh

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-pin-cert

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-recoverkey

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-remote

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-renew-cert

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-repair-database

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-rmemail

@@ -14,7 +14,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-rmlist

@@ -14,7 +14,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-rmuser

@@ -14,7 +14,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-rmxmpp

@@ -1,71 +0,0 @@
-#!/bin/bash
-#
-# .---.                  .              .
-# |                      |              |
-# |--- .--. .-.  .-.  .-.|  .-. .--.--. |.-.  .-. .--.  .-.
-# |    |   (.-' (.-' (   | (   )|  |  | |   )(   )|  | (.-'
-# '    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'
-#
-#                    Freedom in the Cloud
-#
-
-# Removes an xmpp user
-
-# License
-# =======
-#
-# Copyright (C) 2015-2016 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/>.
-
-PROJECT_NAME='freedombone'
-
-export TEXTDOMAIN=${PROJECT_NAME}-rmxmpp
-export TEXTDOMAINDIR="/usr/share/locale"
-
-EMAIL_ADDRESS=
-
-function show_help {
-    echo ''
-    echo $"${PROJECT_NAME}-rmxmpp -e [email address]"
-    echo ''
-    exit 0
-}
-
-while [[ $# > 1 ]]
-do
-key="$1"
-
-case $key in
-    -h|--help)
-    show_help
-    ;;
-    -e|--email)
-    shift
-    EMAIL_ADDRESS="$1"
-    ;;
-    *)
-    # unknown option
-    ;;
-esac
-shift
-done
-
-if [ ! $EMAIL_ADDRESS ]; then
-    show_help
-fi
-
-prosodyctl deluser $EMAIL_ADDRESS
-
-exit 0

src/freedombone-sec

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-splitkey

@@ -19,7 +19,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-syncthing

@@ -14,7 +14,7 @@
 # License
 # =======
 #
-# Copyright (C) 2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2016-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

src/freedombone-tests

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-unignore

@@ -15,7 +15,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-usb-canary

@@ -1,4 +1,32 @@
 #!/bin/bash
+#
+# .---.                  .              .
+# |                      |              |
+# |--- .--. .-.  .-.  .-.|  .-. .--.--. |.-.  .-. .--.  .-.
+# |    |   (.-' (.-' (   | (   )|  |  | |   )(   )|  | (.-'
+# '    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'
+#
+#                    Freedom in the Cloud
+#
+# Generate an email alert if a USB driver is inserted or removed
+
+# License
+# =======
+#
+# Copyright (C) 2017-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/>.
 
 PROJECT_NAME=freedombone
 

src/freedombone-utils-avahi

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-cmake

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-config

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-cron

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-cryptopp

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-depends

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-dns

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-filesystem

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-final

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-git

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-gnusocialtools

@@ -654,7 +654,7 @@ function gnusocial_block_domain_script {
     chmod +x /usr/bin/${database_name}-firewall
 
     if ! grep -q "${database_name}-firewall" /etc/crontab; then
-        echo "*/1            * *   *   *   root /usr/bin/${database_name}-firewall" >> /etc/crontab
+        cron_add_mins 1 "/usr/bin/${database_name}-firewall"
     fi
 }
 

src/freedombone-utils-go

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-help

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-interactive

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-international

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-keys

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-utils-login

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-monkeysphere

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-network

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-onion

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-passwords

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-repos

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-rng

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-selector

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-utils-time

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-tracker

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-turn

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2016-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

src/freedombone-utils-upgrade

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-validation

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-watchdog

@@ -15,7 +15,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-utils-zram

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-vars

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2014-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

src/freedombone-wifi

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2016-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

src/freedombone-xmpp-pass

@@ -14,7 +14,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/freedombone-zram

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

src/meshavahi

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-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

website/EN/app_ghost.html

@@ -3,10 +3,10 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2016-11-20 Sun 15:35 -->
+<!-- 2018-02-21 Wed 16:16 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
-<title></title>
+<title>&lrm;</title>
 <meta name="generator" content="Org mode" />
 <meta name="author" content="Bob Mottram" />
 <meta name="description" content="How to use Ghost"
@@ -71,6 +71,7 @@
   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'; }
@@ -188,7 +189,7 @@
 @licstart  The following is the entire license notice for the
 JavaScript code in this tag.
 
-Copyright (C) 2012-2013 Free Software Foundation, Inc.
+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
@@ -251,9 +252,9 @@ for the JavaScript code in this tag.
 Ghost is a blogging system which uses markdown formatted posts. It's quite simple to use, and also looks nice even on small mobile screens.
 </p>
 
-<div id="outline-container-org3a5c5c6" class="outline-2">
-<h2 id="org3a5c5c6">Installation</h2>
-<div class="outline-text-2" id="text-org3a5c5c6">
+<div id="outline-container-orgae93cef" class="outline-2">
+<h2 id="orgae93cef">Installation</h2>
+<div class="outline-text-2" id="text-orgae93cef">
 <p>
 Log into your system with:
 </p>
@@ -277,9 +278,9 @@ After the install has completed go to <b>Security settings</b> and select <b>Cre
 </div>
 </div>
 
-<div id="outline-container-orga576613" class="outline-2">
-<h2 id="orga576613">Initial setup</h2>
-<div class="outline-text-2" id="text-orga576613">
+<div id="outline-container-org1a75b29" class="outline-2">
+<h2 id="org1a75b29">Initial setup</h2>
+<div class="outline-text-2" id="text-org1a75b29">
 <p>
 If you have just obtained a Lets Encrypt certificate as above then go to <b>About</b> on the administrator control panel and you should see your Ghost blog domain listed there along with an onion address. You can then navigate to your site in a browser.
 </p>

website/EN/app_pleroma.html

@@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2017-11-12 Sun 18:45 -->
+<!-- 2018-02-21 Wed 16:16 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>&lrm;</title>
@@ -252,8 +252,18 @@ for the JavaScript code in this tag.
 </div>
 </div>
 
+<blockquote>
 <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.
+"<i>The way to keep giant companies from sterilizing the Internet is to make their sites irrelevant. If all the cool stuff happens elsewhere, people will follow. We did this with AOL and Prodigy, and we can do it again.</i>" &#x2013; Maciej Cegłowski
+</p>
+</blockquote>
+
+<p>
+Pleroma is an OStatus and ActivityPub 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>
+
+<p>
+Some general advice about life in the fediverse <a href="./fediverse.html">can be found here</a>.
 </p>
 
 <div class="org-center">
@@ -264,9 +274,9 @@ Pleroma is an OStatus-compatible social networking server, compatible with GNU S
 </div>
 </div>
 
-<div id="outline-container-org39de7d0" class="outline-2">
-<h2 id="org39de7d0">Installation</h2>
-<div class="outline-text-2" id="text-org39de7d0">
+<div id="outline-container-orgb538b49" class="outline-2">
+<h2 id="orgb538b49">Installation</h2>
+<div class="outline-text-2" id="text-orgb538b49">
 <p>
 Log into your system with:
 </p>
@@ -286,9 +296,9 @@ Select <b>Add/Remove Apps</b> then <b>pleroma</b>. You will then be asked for a
 </div>
 </div>
 
-<div id="outline-container-org35d8b0a" class="outline-2">
-<h2 id="org35d8b0a">Initial setup</h2>
-<div class="outline-text-2" id="text-org35d8b0a">
+<div id="outline-container-org9e3d185" class="outline-2">
+<h2 id="org9e3d185">Initial setup</h2>
+<div class="outline-text-2" id="text-org9e3d185">
 <p>
 The first thing you'll need to do is register a new account. You can set your profile details and profile image by selecting the small settings icon to the right of your name.
 </p>
@@ -299,9 +309,9 @@ Once you have done that then you can disable further registrations from the <b>A
 </div>
 </div>
 
-<div id="outline-container-org31f6ea0" class="outline-2">
-<h2 id="org31f6ea0">Mastodon user interface</h2>
-<div class="outline-text-2" id="text-org31f6ea0">
+<div id="outline-container-orgaceec12" class="outline-2">
+<h2 id="orgaceec12">Mastodon user interface</h2>
+<div class="outline-text-2" id="text-orgaceec12">
 <p>
 If you prefer a Tweetdeck-style user interface, similar to Mastodon, then once you have registered an account navigate to <b>/yourpleromadomainname/web</b> and log in.
 </p>
@@ -315,6 +325,27 @@ If you prefer a Tweetdeck-style user interface, similar to Mastodon, then once y
 </div>
 </div>
 </div>
+
+<div id="outline-container-org9162549" class="outline-2">
+<h2 id="org9162549">Blocking controls</h2>
+<div class="outline-text-2" id="text-org9162549">
+<div class="org-center">
+
+<div class="figure">
+<p><img src="images/controlpanel/control_panel_blocking.jpg" alt="control_panel_blocking.jpg" />
+</p>
+</div>
+</div>
+
+<p>
+The biggest hazard with Pleroma is that it's part of a public federated communications system. This means that conversations and replies from other servers may end up in your "whole known network" stream. The internet being what it is, some of these could be undesirable. You can block individual users or entire domains by going to the <b>Administrator control panel</b> and selecting <b>Domain or User Blocking</b>, then adding or removing entries. This blocks domains at the firewall level and also at the level of database and file storage.
+</p>
+
+<p>
+If you want to block a particular user then select <b>Block a domain or user</b> and enter the user in the format <b>username@domaintoblock</b> (similar to an email address).
+</p>
+</div>
+</div>
 </div>
 <div id="postamble" class="status">
 

website/EN/apps.html

@@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2018-02-16 Fri 10:42 -->
+<!-- 2018-02-21 Wed 15:05 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>&lrm;</title>
@@ -265,9 +265,9 @@ The base install of the system just contains an email server and Mutt client, bu
 </div>
 
 
-<div id="outline-container-org1bb8cc9" class="outline-2">
-<h2 id="org1bb8cc9">Akaunting</h2>
-<div class="outline-text-2" id="text-org1bb8cc9">
+<div id="outline-container-orga565b08" class="outline-2">
+<h2 id="orga565b08">Akaunting</h2>
+<div class="outline-text-2" id="text-orga565b08">
 <p>
 A web based accounts system for small businesses or freelancers.
 </p>
@@ -277,9 +277,9 @@ A web based accounts system for small businesses or freelancers.
 </p>
 </div>
 </div>
-<div id="outline-container-org1b15bc8" class="outline-2">
-<h2 id="org1b15bc8">BDS Mail</h2>
-<div class="outline-text-2" id="text-org1b15bc8">
+<div id="outline-container-orga6c3fd1" class="outline-2">
+<h2 id="orga6c3fd1">BDS Mail</h2>
+<div class="outline-text-2" id="text-orga6c3fd1">
 <p>
 It's like ordinary email, but with <a href="https://en.wikipedia.org/wiki/I2P">i2p</a> as the transport mechanism.
 </p>
@@ -289,9 +289,9 @@ It's like ordinary email, but with <a href="https://en.wikipedia.org/wiki/I2P">i
 </p>
 </div>
 </div>
-<div id="outline-container-org3782541" class="outline-2">
-<h2 id="org3782541">CryptPad</h2>
-<div class="outline-text-2" id="text-org3782541">
+<div id="outline-container-org38c41a8" class="outline-2">
+<h2 id="org38c41a8">CryptPad</h2>
+<div class="outline-text-2" id="text-org38c41a8">
 <p>
 Collaborate on editing documents, presentations and source code, or vote on things. All with a good level of security.
 </p>
@@ -301,9 +301,9 @@ Collaborate on editing documents, presentations and source code, or vote on thin
 </p>
 </div>
 </div>
-<div id="outline-container-org9361ad2" class="outline-2">
-<h2 id="org9361ad2">DLNA</h2>
-<div class="outline-text-2" id="text-org9361ad2">
+<div id="outline-container-org2b6d6ac" class="outline-2">
+<h2 id="org2b6d6ac">DLNA</h2>
+<div class="outline-text-2" id="text-org2b6d6ac">
 <p>
 Enables you to use the system as a music server which any DLNA compatible devices can connect to within your home network.
 </p>
@@ -313,9 +313,9 @@ Enables you to use the system as a music server which any DLNA compatible device
 </p>
 </div>
 </div>
-<div id="outline-container-orgc1b9f8d" class="outline-2">
-<h2 id="orgc1b9f8d">Dokuwiki</h2>
-<div class="outline-text-2" id="text-orgc1b9f8d">
+<div id="outline-container-org6bd9e13" class="outline-2">
+<h2 id="org6bd9e13">Dokuwiki</h2>
+<div class="outline-text-2" id="text-org6bd9e13">
 <p>
 A databaseless wiki system.
 </p>
@@ -325,9 +325,9 @@ A databaseless wiki system.
 </p>
 </div>
 </div>
-<div id="outline-container-org809c5af" class="outline-2">
-<h2 id="org809c5af">Edith</h2>
-<div class="outline-text-2" id="text-org809c5af">
+<div id="outline-container-orgfb65777" class="outline-2">
+<h2 id="orgfb65777">Edith</h2>
+<div class="outline-text-2" id="text-orgfb65777">
 <p>
 Extremely simple and distraction-free notes system.
 </p>
@@ -337,9 +337,9 @@ Extremely simple and distraction-free notes system.
 </p>
 </div>
 </div>
-<div id="outline-container-org2950e2c" class="outline-2">
-<h2 id="org2950e2c">Emacs</h2>
-<div class="outline-text-2" id="text-org2950e2c">
+<div id="outline-container-orga976ffd" class="outline-2">
+<h2 id="orga976ffd">Emacs</h2>
+<div class="outline-text-2" id="text-orga976ffd">
 <p>
 If you use the Mutt client to read your email then this will set it up to use emacs for composing new mail.
 </p>
@@ -349,9 +349,9 @@ If you use the Mutt client to read your email then this will set it up to use em
 </p>
 </div>
 </div>
-<div id="outline-container-org2349efd" class="outline-2">
-<h2 id="org2349efd">Etherpad</h2>
-<div class="outline-text-2" id="text-org2349efd">
+<div id="outline-container-orgb91b541" class="outline-2">
+<h2 id="orgb91b541">Etherpad</h2>
+<div class="outline-text-2" id="text-orgb91b541">
 <p>
 Collaborate on creating documents in real time. Maybe you're planning a holiday with other family members or creating documentation for a Free Software project along with other volunteers. Etherpad is hard to beat for simplicity and speed. Only users of the system will be able to access it.
 </p>
@@ -361,9 +361,9 @@ Collaborate on creating documents in real time. Maybe you're planning a holiday
 </p>
 </div>
 </div>
-<div id="outline-container-orgbc1e58a" class="outline-2">
-<h2 id="orgbc1e58a">Federated wiki</h2>
-<div class="outline-text-2" id="text-orgbc1e58a">
+<div id="outline-container-org78a1e7a" class="outline-2">
+<h2 id="org78a1e7a">Federated wiki</h2>
+<div class="outline-text-2" id="text-org78a1e7a">
 <p>
 A new approach to creating wiki content.
 </p>
@@ -373,9 +373,9 @@ A new approach to creating wiki content.
 </p>
 </div>
 </div>
-<div id="outline-container-org806878a" class="outline-2">
-<h2 id="org806878a">Friendica</h2>
-<div class="outline-text-2" id="text-org806878a">
+<div id="outline-container-org61b2eec" class="outline-2">
+<h2 id="org61b2eec">Friendica</h2>
+<div class="outline-text-2" id="text-org61b2eec">
 <p>
 Federated social network system.
 </p>
@@ -385,9 +385,9 @@ Federated social network system.
 </p>
 </div>
 </div>
-<div id="outline-container-org13b6601" class="outline-2">
-<h2 id="org13b6601">Ghost</h2>
-<div class="outline-text-2" id="text-org13b6601">
+<div id="outline-container-org6909894" class="outline-2">
+<h2 id="org6909894">Ghost</h2>
+<div class="outline-text-2" id="text-org6909894">
 <p>
 Modern looking blogging system.
 </p>
@@ -397,9 +397,9 @@ Modern looking blogging system.
 </p>
 </div>
 </div>
-<div id="outline-container-org18b5451" class="outline-2">
-<h2 id="org18b5451">GNU Social</h2>
-<div class="outline-text-2" id="text-org18b5451">
+<div id="outline-container-orgd3295e2" class="outline-2">
+<h2 id="orgd3295e2">GNU Social</h2>
+<div class="outline-text-2" id="text-orgd3295e2">
 <p>
 Federated social network based on the OStatus protocol. You can "<i>remote follow</i>" other users within the GNU Social federation.
 </p>
@@ -409,9 +409,9 @@ Federated social network based on the OStatus protocol. You can "<i>remote follo
 </p>
 </div>
 </div>
-<div id="outline-container-org877ac0a" class="outline-2">
-<h2 id="org877ac0a">Gogs</h2>
-<div class="outline-text-2" id="text-org877ac0a">
+<div id="outline-container-orgf9c3325" class="outline-2">
+<h2 id="orgf9c3325">Gogs</h2>
+<div class="outline-text-2" id="text-orgf9c3325">
 <p>
 Lightweight git project hosting system. You can mirror projects from Github, or if Github turns evil then just host your own projects while retaining the familiar <i>fork-and-pull</i> workflow. If you can use Github then you can also use Gogs.
 </p>
@@ -421,9 +421,9 @@ Lightweight git project hosting system. You can mirror projects from Github, or
 </p>
 </div>
 </div>
-<div id="outline-container-orga2ff624" class="outline-2">
-<h2 id="orga2ff624">HTMLy</h2>
-<div class="outline-text-2" id="text-orga2ff624">
+<div id="outline-container-orgfde0d6d" class="outline-2">
+<h2 id="orgfde0d6d">HTMLy</h2>
+<div class="outline-text-2" id="text-orgfde0d6d">
 <p>
 Databaseless blogging system. Quite simple and with a markdown-like format.
 </p>
@@ -433,9 +433,9 @@ Databaseless blogging system. Quite simple and with a markdown-like format.
 </p>
 </div>
 </div>
-<div id="outline-container-org807c97c" class="outline-2">
-<h2 id="org807c97c">Hubzilla</h2>
-<div class="outline-text-2" id="text-org807c97c">
+<div id="outline-container-org28717c9" class="outline-2">
+<h2 id="org28717c9">Hubzilla</h2>
+<div class="outline-text-2" id="text-org28717c9">
 <p>
 Web publishing platform with social network like features and good privacy controls so that it's possible to specify who can see which content. Includes photo albums, calendar, wiki and file storage.
 </p>
@@ -445,9 +445,9 @@ Web publishing platform with social network like features and good privacy contr
 </p>
 </div>
 </div>
-<div id="outline-container-org95e3282" class="outline-2">
-<h2 id="org95e3282">Icecast media stream</h2>
-<div class="outline-text-2" id="text-org95e3282">
+<div id="outline-container-org8b67211" class="outline-2">
+<h2 id="org8b67211">Icecast media stream</h2>
+<div class="outline-text-2" id="text-org8b67211">
 <p>
 Make your own internet radio station.
 </p>
@@ -457,9 +457,9 @@ Make your own internet radio station.
 </p>
 </div>
 </div>
-<div id="outline-container-orgd272c05" class="outline-2">
-<h2 id="orgd272c05">IRC Server (ngirc)</h2>
-<div class="outline-text-2" id="text-orgd272c05">
+<div id="outline-container-org620e0a2" class="outline-2">
+<h2 id="org620e0a2">IRC Server (ngirc)</h2>
+<div class="outline-text-2" id="text-org620e0a2">
 <p>
 Run your own IRC chat channel which can be secured with a password and accessible via an onion address. A bouncer is included so that you can receive messages sent while you were offline. Works with Hexchat and other popular clients.
 </p>
@@ -469,18 +469,18 @@ Run your own IRC chat channel which can be secured with a password and accessibl
 </p>
 </div>
 </div>
-<div id="outline-container-org6b54bf7" class="outline-2">
-<h2 id="org6b54bf7">Jitsi Meet</h2>
-<div class="outline-text-2" id="text-org6b54bf7">
+<div id="outline-container-orgaf23bf9" class="outline-2">
+<h2 id="orgaf23bf9">Jitsi Meet</h2>
+<div class="outline-text-2" id="text-orgaf23bf9">
 <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-org0604538" class="outline-2">
-<h2 id="org0604538">KanBoard</h2>
-<div class="outline-text-2" id="text-org0604538">
+<div id="outline-container-org24aec82" class="outline-2">
+<h2 id="org24aec82">KanBoard</h2>
+<div class="outline-text-2" id="text-org24aec82">
 <p>
 A simple kanban system for managing projects or TODO lists.
 </p>
@@ -490,9 +490,9 @@ A simple kanban system for managing projects or TODO lists.
 </p>
 </div>
 </div>
-<div id="outline-container-orgcd31aa0" class="outline-2">
-<h2 id="orgcd31aa0">Key Server</h2>
-<div class="outline-text-2" id="text-orgcd31aa0">
+<div id="outline-container-org45a3c93" class="outline-2">
+<h2 id="org45a3c93">Key Server</h2>
+<div class="outline-text-2" id="text-org45a3c93">
 <p>
 An OpenPGP key server for storing and retrieving GPG public keys.
 </p>
@@ -502,9 +502,9 @@ An OpenPGP key server for storing and retrieving GPG public keys.
 </p>
 </div>
 </div>
-<div id="outline-container-org18f0038" class="outline-2">
-<h2 id="org18f0038">Koel</h2>
-<div class="outline-text-2" id="text-org18f0038">
+<div id="outline-container-org0a24944" class="outline-2">
+<h2 id="org0a24944">Koel</h2>
+<div class="outline-text-2" id="text-org0a24944">
 <p>
 Access your music collection from any internet connected device.
 </p>
@@ -514,9 +514,9 @@ Access your music collection from any internet connected device.
 </p>
 </div>
 </div>
-<div id="outline-container-orgdac8618" class="outline-2">
-<h2 id="orgdac8618">Lychee</h2>
-<div class="outline-text-2" id="text-orgdac8618">
+<div id="outline-container-org3a2e6f7" class="outline-2">
+<h2 id="org3a2e6f7">Lychee</h2>
+<div class="outline-text-2" id="text-org3a2e6f7">
 <p>
 Make your photo albums available on the web.
 </p>
@@ -526,9 +526,9 @@ Make your photo albums available on the web.
 </p>
 </div>
 </div>
-<div id="outline-container-org2f65f95" class="outline-2">
-<h2 id="org2f65f95">Mailpile</h2>
-<div class="outline-text-2" id="text-org2f65f95">
+<div id="outline-container-org2ce1251" class="outline-2">
+<h2 id="org2ce1251">Mailpile</h2>
+<div class="outline-text-2" id="text-org2ce1251">
 <p>
 Modern email client which supports GPG encryption.
 </p>
@@ -538,9 +538,9 @@ Modern email client which supports GPG encryption.
 </p>
 </div>
 </div>
-<div id="outline-container-org35b7261" class="outline-2">
-<h2 id="org35b7261">Matrix</h2>
-<div class="outline-text-2" id="text-org35b7261">
+<div id="outline-container-orgc7cd13f" class="outline-2">
+<h2 id="orgc7cd13f">Matrix</h2>
+<div class="outline-text-2" id="text-orgc7cd13f">
 <p>
 Multi-user chat with some security and moderation controls.
 </p>
@@ -550,9 +550,9 @@ Multi-user chat with some security and moderation controls.
 </p>
 </div>
 </div>
-<div id="outline-container-orgf522d1b" class="outline-2">
-<h2 id="orgf522d1b">Mediagoblin</h2>
-<div class="outline-text-2" id="text-orgf522d1b">
+<div id="outline-container-orgddb22c7" class="outline-2">
+<h2 id="orgddb22c7">Mediagoblin</h2>
+<div class="outline-text-2" id="text-orgddb22c7">
 <p>
 Publicly host video and audio files so that you don't need to use YouTube/Vimeo/etc.
 </p>
@@ -562,9 +562,9 @@ Publicly host video and audio files so that you don't need to use YouTube/Vimeo/
 </p>
 </div>
 </div>
-<div id="outline-container-orgdd0c788" class="outline-2">
-<h2 id="orgdd0c788">Mumble</h2>
-<div class="outline-text-2" id="text-orgdd0c788">
+<div id="outline-container-org3443452" class="outline-2">
+<h2 id="org3443452">Mumble</h2>
+<div class="outline-text-2" id="text-org3443452">
 <p>
 The popular VoIP and text chat system. Say goodbye to old-fashioned telephony conferences with silly dial codes. Also works well on mobile.
 </p>
@@ -574,9 +574,9 @@ The popular VoIP and text chat system. Say goodbye to old-fashioned telephony co
 </p>
 </div>
 </div>
-<div id="outline-container-org29456cf" class="outline-2">
-<h2 id="org29456cf">NextCloud</h2>
-<div class="outline-text-2" id="text-org29456cf">
+<div id="outline-container-org41c4d06" class="outline-2">
+<h2 id="org41c4d06">NextCloud</h2>
+<div class="outline-text-2" id="text-org41c4d06">
 <p>
 Store files on your server and sync them with laptops or mobile devices. Includes many plugins including videoconferencing and collaborative document editing.
 </p>
@@ -586,9 +586,9 @@ Store files on your server and sync them with laptops or mobile devices. Include
 </p>
 </div>
 </div>
-<div id="outline-container-orgbcb8568" class="outline-2">
-<h2 id="orgbcb8568">PeerTube</h2>
-<div class="outline-text-2" id="text-orgbcb8568">
+<div id="outline-container-org0b5e2de" class="outline-2">
+<h2 id="org0b5e2de">PeerTube</h2>
+<div class="outline-text-2" id="text-org0b5e2de">
 <p>
 Peer-to-peer video hosting. Similar to Mediagoblin, but the P2P aspect better enables the streaming load to be shared across servers.
 </p>
@@ -598,9 +598,9 @@ Peer-to-peer video hosting. Similar to Mediagoblin, but the P2P aspect better en
 </p>
 </div>
 </div>
-<div id="outline-container-org46e7bef" class="outline-2">
-<h2 id="org46e7bef">PI-Hole</h2>
-<div class="outline-text-2" id="text-org46e7bef">
+<div id="outline-container-orgbc69da3" class="outline-2">
+<h2 id="orgbc69da3">PI-Hole</h2>
+<div class="outline-text-2" id="text-orgbc69da3">
 <p>
 The black hole for web adverts. Block adverts at the domain name level within your local network. It can significantly reduce bandwidth, speed up page load times and protect your systems from being tracked by spyware.
 </p>
@@ -610,9 +610,21 @@ The black hole for web adverts. Block adverts at the domain name level within yo
 </p>
 </div>
 </div>
-<div id="outline-container-orgf349fcf" class="outline-2">
-<h2 id="orgf349fcf">PostActiv</h2>
-<div class="outline-text-2" id="text-orgf349fcf">
+<div id="outline-container-orgae7a92d" class="outline-2">
+<h2 id="orgae7a92d">Pleroma</h2>
+<div class="outline-text-2" id="text-orgae7a92d">
+<p>
+Fediverse instance which is compatible with GNU Social and Mastodon, and suited for systems without much RAM or CPU resource.
+</p>
+
+<p>
+<a href="./app_pleroma.html">How to use it</a>
+</p>
+</div>
+</div>
+<div id="outline-container-org94767b4" class="outline-2">
+<h2 id="org94767b4">PostActiv</h2>
+<div class="outline-text-2" id="text-org94767b4">
 <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>
@@ -622,9 +634,9 @@ An alternative federated social networking system compatible with GNU Social, Pl
 </p>
 </div>
 </div>
-<div id="outline-container-org842b0ba" class="outline-2">
-<h2 id="org842b0ba">PrivateBin</h2>
-<div class="outline-text-2" id="text-org842b0ba">
+<div id="outline-container-org0ba2849" class="outline-2">
+<h2 id="org0ba2849">PrivateBin</h2>
+<div class="outline-text-2" id="text-org0ba2849">
 <p>
 A pastebin where the server has zero knowledge of the content being pasted.
 </p>
@@ -634,9 +646,9 @@ A pastebin where the server has zero knowledge of the content being pasted.
 </p>
 </div>
 </div>
-<div id="outline-container-org75de424" class="outline-2">
-<h2 id="org75de424">Profanity</h2>
-<div class="outline-text-2" id="text-org75de424">
+<div id="outline-container-orgcd96abb" class="outline-2">
+<h2 id="orgcd96abb">Profanity</h2>
+<div class="outline-text-2" id="text-orgcd96abb">
 <p>
 A shell based XMPP client which you can run on the Freedombone server via ssh.
 </p>
@@ -646,9 +658,9 @@ A shell based XMPP client which you can run on the Freedombone server via ssh.
 </p>
 </div>
 </div>
-<div id="outline-container-org127dc3f" class="outline-2">
-<h2 id="org127dc3f">Riot Web</h2>
-<div class="outline-text-2" id="text-org127dc3f">
+<div id="outline-container-orgb9c3c0b" class="outline-2">
+<h2 id="orgb9c3c0b">Riot Web</h2>
+<div class="outline-text-2" id="text-orgb9c3c0b">
 <p>
 A browser based user interface for the Matrix federated communications system, including WebRTC audio and video chat.
 </p>
@@ -658,9 +670,9 @@ A browser based user interface for the Matrix federated communications system, i
 </p>
 </div>
 </div>
-<div id="outline-container-org179bd91" class="outline-2">
-<h2 id="org179bd91">SearX</h2>
-<div class="outline-text-2" id="text-org179bd91">
+<div id="outline-container-orgd05631d" class="outline-2">
+<h2 id="orgd05631d">SearX</h2>
+<div class="outline-text-2" id="text-orgd05631d">
 <p>
 A metasearch engine for customised and private web searches.
 </p>
@@ -670,9 +682,9 @@ A metasearch engine for customised and private web searches.
 </p>
 </div>
 </div>
-<div id="outline-container-orgffb086f" class="outline-2">
-<h2 id="orgffb086f">tt-rss</h2>
-<div class="outline-text-2" id="text-orgffb086f">
+<div id="outline-container-org2a1819a" class="outline-2">
+<h2 id="org2a1819a">tt-rss</h2>
+<div class="outline-text-2" id="text-org2a1819a">
 <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>
@@ -682,9 +694,9 @@ Private RSS reader. Pulls in RSS/Atom feeds via Tor and is only accessible via a
 </p>
 </div>
 </div>
-<div id="outline-container-org69b4a9f" class="outline-2">
-<h2 id="org69b4a9f">Syncthing</h2>
-<div class="outline-text-2" id="text-org69b4a9f">
+<div id="outline-container-org7325a35" class="outline-2">
+<h2 id="org7325a35">Syncthing</h2>
+<div class="outline-text-2" id="text-org7325a35">
 <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>
@@ -694,9 +706,9 @@ Possibly the best way to synchronise files across all of your devices. Once it h
 </p>
 </div>
 </div>
-<div id="outline-container-org289e2f4" class="outline-2">
-<h2 id="org289e2f4">Tahoe-LAFS</h2>
-<div class="outline-text-2" id="text-org289e2f4">
+<div id="outline-container-orge582914" class="outline-2">
+<h2 id="orge582914">Tahoe-LAFS</h2>
+<div class="outline-text-2" id="text-orge582914">
 <p>
 Robust and encrypted storage of files on one or more server.
 </p>
@@ -706,9 +718,9 @@ Robust and encrypted storage of files on one or more server.
 </p>
 </div>
 </div>
-<div id="outline-container-org9660e8b" class="outline-2">
-<h2 id="org9660e8b">Tox</h2>
-<div class="outline-text-2" id="text-org9660e8b">
+<div id="outline-container-org0f44920" class="outline-2">
+<h2 id="org0f44920">Tox</h2>
+<div class="outline-text-2" id="text-org0f44920">
 <p>
 Client and bootstrap node for the Tox chat/VoIP system.
 </p>
@@ -718,9 +730,9 @@ Client and bootstrap node for the Tox chat/VoIP system.
 </p>
 </div>
 </div>
-<div id="outline-container-org98827e8" class="outline-2">
-<h2 id="org98827e8">Turtl</h2>
-<div class="outline-text-2" id="text-org98827e8">
+<div id="outline-container-org9e5e0ed" class="outline-2">
+<h2 id="org9e5e0ed">Turtl</h2>
+<div class="outline-text-2" id="text-org9e5e0ed">
 <p>
 A system for privately creating and sharing notes and images, similar to Evernote but without the spying.
 </p>
@@ -730,18 +742,18 @@ A system for privately creating and sharing notes and images, similar to Evernot
 </p>
 </div>
 </div>
-<div id="outline-container-orgb94b916" class="outline-2">
-<h2 id="orgb94b916">Vim</h2>
-<div class="outline-text-2" id="text-orgb94b916">
+<div id="outline-container-org47df89a" class="outline-2">
+<h2 id="org47df89a">Vim</h2>
+<div class="outline-text-2" id="text-org47df89a">
 <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-org78963d2" class="outline-2">
-<h2 id="org78963d2">Virtual Private Network (VPN)</h2>
-<div class="outline-text-2" id="text-org78963d2">
+<div id="outline-container-org1ae77f6" class="outline-2">
+<h2 id="org1ae77f6">Virtual Private Network (VPN)</h2>
+<div class="outline-text-2" id="text-org1ae77f6">
 <p>
 Set up a VPN on your server so that you can bypass local internet censorship.
 </p>
@@ -751,9 +763,9 @@ Set up a VPN on your server so that you can bypass local internet censorship.
 </p>
 </div>
 </div>
-<div id="outline-container-orgd631bb2" class="outline-2">
-<h2 id="orgd631bb2">XMPP</h2>
-<div class="outline-text-2" id="text-orgd631bb2">
+<div id="outline-container-org293b43b" class="outline-2">
+<h2 id="org293b43b">XMPP</h2>
+<div class="outline-text-2" id="text-org293b43b">
 <p>
 Chat server which can be used together with client such as Gajim or Conversations to provide end-to-end content security and also onion routed metadata security. Includes advanced features such as <i>client state notification</i> to save battery power on your mobile devices, support for seamless roaming between networks and <i>message carbons</i> so that you can receive the same messages while being simultaneously logged in to your account on more than one device.
 </p>

website/EN/fediverse.html

@@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2018-01-29 Mon 10:19 -->
+<!-- 2018-02-21 Wed 14:52 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>&lrm;</title>
@@ -252,54 +252,62 @@ for the JavaScript code in this tag.
 Some things you might want to know about the Fediverse:
 </p>
 
-<div id="outline-container-org403f1ae" class="outline-2">
-<h2 id="org403f1ae">Keep the number of users on each server small</h2>
-<div class="outline-text-2" id="text-org403f1ae">
+<div id="outline-container-org0e5c3f9" class="outline-2">
+<h2 id="org0e5c3f9">Federation as a concept</h2>
+<div class="outline-text-2" id="text-org0e5c3f9">
+<p>
+The political definition of a federation is "<i>a union of partially self-governing states or regions under a central (federal) government</i>". The fediverse isn't exactly like that, in that there is no federal government. However there are protocols which govern the communication between instances and that might be analogized to being a sort of elemantary constitution or mutual agreement binding all participants together. The protocols are merely ways of moving data around though, and don't impose any sort of moral code.
+</p>
+</div>
+</div>
+<div id="outline-container-org90385ba" class="outline-2">
+<h2 id="org90385ba">Keep the number of users on each server small</h2>
+<div class="outline-text-2" id="text-org90385ba">
 <p>
 The importance of this can't be overstated. Servers with lots of users always eventually have problems where the interests of the users are not the same as the interests of the server administrator. If you are the server administrator, or if there are only a small squad-size group of people on the server, then it's a lot easier to resolve differences and everyone's interests are likely to be similar.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org4b8c27b" class="outline-2">
-<h2 id="org4b8c27b">Drama will happen</h2>
-<div class="outline-text-2" id="text-org4b8c27b">
+<div id="outline-container-org1f1a75f" class="outline-2">
+<h2 id="org1f1a75f">Drama will happen</h2>
+<div class="outline-text-2" id="text-org1f1a75f">
 <p>
 It's inevitable in any social network, but fortunately your options for dealing with it are better than they are in the giant proprietary monoliths. In the proprietary world Google or Facebook don't give a damn about the fate of individual users. On a server with a small number of users if you're getting griefed then the administrator is likely to care and be able to do something about it.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org6bb90e7" class="outline-2">
-<h2 id="org6bb90e7">Don't be afraid to block</h2>
-<div class="outline-text-2" id="text-org6bb90e7">
+<div id="outline-container-org249f254" class="outline-2">
+<h2 id="org249f254">Don't be afraid to block</h2>
+<div class="outline-text-2" id="text-org249f254">
 <p>
 Especially if other servers are publishing content which may not be legal in your jurisdiction then don't be afraid to use domain or user blocking from the <b>Administrator control panel</b>. The same applies if users on other servers are trying to harass you. Blocking creates politics and drama but <span class="underline">this is a feature not a bug</span>. It allows you to craft your own distinct community and user experience while also existing in the wider federation. It's hard to do this on sites like Twitter or Facebook. Try to keep blocking to a minimum though and avoid doing it for insubstantial reasons. If you have other users on your server then publish the blocked domains list somewhere they can see. That avoids disappointment and enables you to have a discussion about the validity of blocking decisions.
 </p>
 </div>
 </div>
 
-<div id="outline-container-orgded15c7" class="outline-2">
-<h2 id="orgded15c7">Network structure maps on to social structure</h2>
-<div class="outline-text-2" id="text-orgded15c7">
+<div id="outline-container-org16e1345" class="outline-2">
+<h2 id="org16e1345">Network structure maps on to social structure</h2>
+<div class="outline-text-2" id="text-org16e1345">
 <p>
 Over time follows and blocking rules come to match the underlying social geography of affinity groups. Blocking will happen and users will move around or start new servers. Drama related to blocking will dissipate.
 </p>
 </div>
 </div>
 
-<div id="outline-container-orgd6823a8" class="outline-2">
-<h2 id="orgd6823a8">Keep your follows under the Dunbar number</h2>
-<div class="outline-text-2" id="text-orgd6823a8">
+<div id="outline-container-orga5968b2" class="outline-2">
+<h2 id="orga5968b2">Keep your follows under the Dunbar number</h2>
+<div class="outline-text-2" id="text-orga5968b2">
 <p>
 Keep the number of other users you're following and who are also active to under a couple of hundred. Any more than that and you'll just be overwhelmed by irrelevant stuff and whatever community you may have been part of will dissolve in a sea of entropy. There are no algorithmic timelines, and even if they're introduced then they create their own problems as an opaque form of censorship. <span class="underline">Real community happens at tribal scale</span>. It's something which people often don't like to admit because they get fixated upon bigger and bigger numbers, but it definitely seems to be true.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org77ec195" class="outline-2">
-<h2 id="org77ec195">Avoid big public servers</h2>
-<div class="outline-text-2" id="text-org77ec195">
+<div id="outline-container-orgc8c8b40" class="outline-2">
+<h2 id="orgc8c8b40">Avoid big public servers</h2>
+<div class="outline-text-2" id="text-orgc8c8b40">
 <p>
 It may seem like a good idea and it may seem like you're doing a service to the community by allowing random strangers to register, but servers with thousands of users only cause problems - social, administrative, financial and possibly also legal. The financial strain of running a powerful server with high reliability may be enough to encourage the administrator to begin pushing advertising onto the system, or sell user content, and then before you know it you have identical problems to Twitter. Instead try to encourage people to set up their own servers. Follow this principle and a lot of arguments and stress will be more easily avoided.
 </p>