Separate xmpp documentation

doc/EN/app_xmpp.org

@@ -0,0 +1,149 @@
+#+TITLE:
+#+AUTHOR: Bob Mottram
+#+EMAIL: bob@freedombone.net
+#+KEYWORDS: freedombone, xmpp
+#+DESCRIPTION: How to use XMPP/Jabber
+#+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>XMPP/Jabber</h1>
+</center>
+#+END_EXPORT
+
+Most people know XMPP as "/Jabber/" and it's sometimes regarded and an old protocol once used by Google and Facebook but which is no longer relevant. However, it still works and if appropriately configured, as if is on Freedombone, can provide the best chat messaging security currently available.
+
+With regard to chat apps you might have read a lot of stuff about /end-to-end security/. That's important, but to also protect the metadata of who sends messages to who the data needs to be onion routed (wrapped in multiple layers of routing encryption), and that's something which most popular chat apps don't provide. Also beware of chat apps which fundamentally rely upon Google's infrastructure. You can be sure that they extensively data mine everything and will be able to reconstruct your social graph if that's at all technically feasible, then pass that to whatever governments they're friendly with or trying to lobby.
+
+A well written article on the state of XMPP and how it compares to other chat protocols [[https://gultsch.de/xmpp_2016.html][can be found here]].
+
+* Using with Gajim
+In mid 2016 [[https://gajim.org/][Gajim]] became the first desktop XMPP client to support the [[https://en.wikipedia.org/wiki/OMEMO][OMEMO end-to-end security standard]], which is superior to the more traditional [[https://en.wikipedia.org/wiki/Off-the-Record_Messaging][OTR]] since it also includes multi-user chat and the ratcheting mechanism pioneered by Open Whisper Systems. To install it:
+
+#+begin_src bash :tangle no
+su -c 'echo "deb ftp://ftp.gajim.org/debian unstable main" > /etc/apt/sources.list.d/gajim.list'
+sudo apt-get update
+sudo apt-get -y install gajim-dev-keyring
+sudo apt-get -y install git tor python-dev python-pip gajim-nightly
+mkdir ~/.local/share/gajim/plugins -p
+cd ~/.local/share/gajim/plugins
+git clone https://github.com/omemo/gajim-omemo
+sudo pip install protobuf==2.6.1, python-axolotl==0.1.35
+#+end_src
+
+Open Gajim and enter your XMPP address and password.
+
+Go to *Edit/Preferences* and select the *Advanced* tab. Under *Global Proxy* select *Tor* and the *Close* button. Then select *Edit/Plugins* and make sure that OMEMO is active (ticked), then select the *Close* button.
+
+When you start a conversation make sure that the OMEMO box is ticked. You can also click on the keys button and trust various fingerprints. Both sides will need to do that before an encrypted chat can start.
+
+If you wish to make backups of the OMEMO keys then they can be found within:
+
+#+begin_src bash :tangle no
+~/.local/share/gajim
+#+end_src
+
+If you wish to use OpenPGP to encrypt your messages then go to *Edit/Accounts*, select your account and then the *Personal Information* tab. You can then choose your GPG key. When initiating a chat you can select the *Advanced* button and then select *Toggle OpenPGP Encryption*. OpenPGP is not as secure as OMEMO, but does allow you to use XMPP in a similar style to email in that the recipient of the message does not necessarily need to be online at the same time that you send it.
+
+* Using with Profanity
+The [[https://profanity.im][Profanity]] shell based user interface and is perhaps the simplest way to use XMPP from a laptop. It's also a good way to ensure that your OTR keys are the same even when logging in from different laptops or devices, and it also means that if those devices later become compomised then there are no locally stored OTR keys to be found.
+
+#+BEGIN_SRC bash
+ssh username@domain -p 2222
+#+END_SRC
+
+Then select XMPP. Generate an [[https://en.wikipedia.org/wiki/Off-the-Record_Messaging][OTR]] key with:
+
+#+BEGIN_SRC bash
+/otr gen
+#+END_SRC
+
+Then to start a conversation using OTR:
+
+#+BEGIN_SRC bash
+/otr start otherusername@otheruserdomain
+#+END_SRC
+
+or if you're already in an insecure chat with someone just use:
+
+#+BEGIN_SRC bash
+/otr start
+#+END_SRC
+
+Set a security question and answer:
+
+#+BEGIN_SRC bash
+/otr question "What is the name of your best friends rabbit?" fiffi
+#+END_SRC
+
+On the other side the user can enter:
+
+#+BEGIN_SRC bash
+/otr answer fiffi
+#+END_SRC
+
+For the most paranoid you can also obtain your fingerprint:
+
+#+BEGIN_SRC bash
+/otr myfp
+#+END_SRC
+
+and quote that.  If they quote theirs back you can check it with:
+
+#+BEGIN_SRC bash
+/otr theirfp
+#+END_SRC
+
+If the fingerprints match then you can be pretty confident that unless you have been socially engineered via the question and answer you probably are talking to who you think you are, and that it will be difficult for mass surveillance systems to know the content of the conversation. For more details see [[https://www.profanity.im/otr.html][this guide]]
+
+ When accessed via the user control panel the client is automatically routed through Tor and so if you are also using OTR then this provides protection for both message content and metadata.
+
+* Using with Jitsi
+Jitsi can be downloaded from https://jitsi.org
+
+On your desktop/laptop open Jitsi and select *Options* from the *Tools* menu.
+
+Click *Add* to add a new user, then enter the Jabber ID (yourusername@yourmaindomainname). Close and then you should notice that your status is "Online" (or if not then you should be able to set it to online).
+
+From the *File* menu you can add contacts, then select the chat icon to begin a chat.  Click on the lock icon on the right hand side and this will initiate an authentication procedure in which you can specify a question and answer to verify the identity of the person you're communicating with.  Once authentication is complete then you'll be chating using OTR, which provides an additional layer of security.
+
+When opening Jitsi initially you will get a certificate warning for your domain name (assuming that you're using a self-signed certificate). If this happens then select *View Certificate* and enable the checkbox to trust the certificate, then select *Continue Anyway*.  Once you've done this then the certificate warning will not appear again unless you reinstall Jitsi or use a different computer.
+
+You can also [[https://www.youtube.com/watch?v=vgx7VSrDGjk][see this video]] as an example of using OTR.
+
+* Using with Ubuntu
+The default XMPP client in Ubuntu is Empathy.  Using Empathy isn't as secure as using Jitsi, since it doesn't include the /off the record/ feature, but since it's the default it's what many users will have easy access to.
+
+Open *System Settings* and select *Online Accounts*, *Add account*  and then *Jabber*.
+
+Enter your username (username@domainname) and password.
+
+Click on *Advanced* and make sure that *Encryption required* and *Ignore SSL certificate errors* are checked.  Ignoring the certificate errors will allow you to use the self-signed certificate created earlier.  Then click *Done* and set your Jabber account and Empathy to *On*.
+
+* Using Tor Messenger
+Tor Messenger is a messaging client which supports XMPP, and its onion routing enables you to protect the metadata of chat interactions to some extent by making it difficult for an adversary to know which server is talking to which. You can download Tor Messenger from [[https://torproject.org][torproject.org]] and the setup is pretty simple.
+
+* Using with Android/Conversations
+Install [[https://f-droid.org/][F-Droid]]
+
+Search for and install *Orbot* and *Conversations*.
+
+Add an account and enter your Jabber/XMPP ID and password.
+
+From the menu select *Settings* then *Expert Settings*. Select *Connect via Tor* and depending on your situation you might also want to select *Don't save encrypted messages*. Also within expert settings select *Keep in foreground*. This will enable you to still receive notifications when your device is in standby mode with the screen turned off.
+
+From the menu select *Manage accounts* and add a new account.
+
+#+BEGIN_SRC bash
+Jabber ID: myusername@mydomain
+Password:  your XMPP password
+Hostname:  mydomain (preferably your xmpp onion address)
+Port:      5222
+#+END_SRC
+
+Then select *Next*. When chatting you can use the lock icon to encrypt your conversation. OMEMO is the recommended type of encryption. It's also going through Tor, so passive surveillance of the metadata should not be easy for an adversary.

doc/EN/apps.org

@@ -90,3 +90,5 @@ If you use the Mutt client to read your email then this will set it up to use vi
 
 * XMPP
 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 /client state notification/ to save battery power on your mobile devices, support for seamless roaming between networks and /message carbons/ so that you can receive the same messages while being simultaneously logged in to your account on more than one device.
+
+[[./app_xmpp.html][How to use it]]

doc/EN/usage.org

@@ -26,6 +26,7 @@
 | [[./app_gnusocial.html][Microblogging (GNU Social)]]                           |
 | [[./app_hubzilla.html][Social Network]]                                       |
 | [[./app_irc.html][Multi-user chat with IRC]]                             |
+| [[./app_xmpp.html][XMPP/Jabber]]                                          |
 | [[Chat Services]]                                        |
 | [[RSS Reader]]                                           |
 | [[Git Projects]]                                         |
@@ -99,133 +100,6 @@ ssh username@address.onion -p 2222
 
 Subsequently even if dynamic DNS isn't working you may still be able to administer your system. Using the onion address also gives you some degree of protection against corporate or government metadata analysis, since it becomes more difficult to passively detect which systems are communicating.
 * Chat Services
-
-** XMPP/Jabber
-*** About XMPP
-A well written article on the state of XMPP and how it compares to other chat protocols [[https://gultsch.de/xmpp_2016.html][can be found here]].
-*** Using with Gajim
-In mid 2016 [[https://gajim.org/][Gajim]] became the first desktop XMPP client to support the [[https://en.wikipedia.org/wiki/OMEMO][OMEMO end-to-end security standard]], which is superior to the more traditional [[https://en.wikipedia.org/wiki/Off-the-Record_Messaging][OTR]] since it also includes multi-user chat and the ratcheting mechanism pioneered by Open Whisper Systems. To install it:
-
-#+begin_src bash :tangle no
-su -c 'echo "deb ftp://ftp.gajim.org/debian unstable main" > /etc/apt/sources.list.d/gajim.list'
-sudo apt-get update
-sudo apt-get -y install gajim-dev-keyring
-sudo apt-get -y install git tor python-dev python-pip gajim-nightly
-mkdir ~/.local/share/gajim/plugins -p
-cd ~/.local/share/gajim/plugins
-git clone https://github.com/omemo/gajim-omemo
-sudo pip install protobuf==2.6.1, python-axolotl==0.1.35
-#+end_src
-
-Open Gajim and enter your XMPP address and password.
-
-Go to *Edit/Preferences* and select the *Advanced* tab. Under *Global Proxy* select *Tor* and the *Close* button. Then select *Edit/Plugins* and make sure that OMEMO is active (ticked), then select the *Close* button.
-
-When you start a conversation make sure that the OMEMO box is ticked. You can also click on the keys button and trust various fingerprints. Both sides will need to do that before an encrypted chat can start.
-
-If you wish to make backups of the OMEMO keys then they can be found within:
-
-#+begin_src bash :tangle no
-~/.local/share/gajim
-#+end_src
-
-If you wish to use OpenPGP to encrypt your messages then go to *Edit/Accounts*, select your account and then the *Personal Information* tab. You can then choose your GPG key. When initiating a chat you can select the *Advanced* button and then select *Toggle OpenPGP Encryption*. OpenPGP is not as secure as OMEMO, but does allow you to use XMPP in a similar style to email in that the recipient of the message does not necessarily need to be online at the same time that you send it.
-
-*** Using with Profanity
-The [[https://profanity.im][Profanity]] shell based user interface and is perhaps the simplest way to use XMPP from a laptop. It's also a good way to ensure that your OTR keys are the same even when logging in from different laptops or devices, and it also means that if those devices later become compomised then there are no locally stored OTR keys to be found.
-
-#+BEGIN_SRC bash
-ssh username@domain -p 2222
-#+END_SRC
-
-Then select XMPP. Generate an [[https://en.wikipedia.org/wiki/Off-the-Record_Messaging][OTR]] key with:
-
-#+BEGIN_SRC bash
-/otr gen
-#+END_SRC
-
-Then to start a conversation using OTR:
-
-#+BEGIN_SRC bash
-/otr start otherusername@otheruserdomain
-#+END_SRC
-
-or if you're already in an insecure chat with someone just use:
-
-#+BEGIN_SRC bash
-/otr start
-#+END_SRC
-
-Set a security question and answer:
-
-#+BEGIN_SRC bash
-/otr question "What is the name of your best friends rabbit?" fiffi
-#+END_SRC
-
-On the other side the user can enter:
-
-#+BEGIN_SRC bash
-/otr answer fiffi
-#+END_SRC
-
-For the most paranoid you can also obtain your fingerprint:
-
-#+BEGIN_SRC bash
-/otr myfp
-#+END_SRC
-
-and quote that.  If they quote theirs back you can check it with:
-
-#+BEGIN_SRC bash
-/otr theirfp
-#+END_SRC
-
-If the fingerprints match then you can be pretty confident that unless you have been socially engineered via the question and answer you probably are talking to who you think you are, and that it will be difficult for mass surveillance systems to know the content of the conversation. For more details see [[https://www.profanity.im/otr.html][this guide]]
-
- When accessed via the user control panel the client is automatically routed through Tor and so if you are also using OTR then this provides protection for both message content and metadata.
-*** Using with Jitsi
-Jitsi is the recommended communications client for desktop or laptop systems, since it includes the /off the record/ (OTR) feature which provides some additional security beyond the usual SSL certificates.
-
-Jitsi can be downloaded from https://jitsi.org
-
-On your desktop/laptop open Jitsi and select *Options* from the *Tools* menu.
-
-Click *Add* to add a new user, then enter the Jabber ID which you previously specified with /prosodyctl/ when setting up the XMPP server. Close and then you should notice that your status is "Online" (or if not then you should be able to set it to online).
-
-From the *File* menu you can add contacts, then select the chat icon to begin a chat.  Click on the lock icon on the right hand side and this will initiate an authentication procedure in which you can specify a question and answer to verify the identity of the person you're communicating with.  Once authentication is complete then you'll be chating using OTR, which provides an additional layer of security.
-
-When opening Jitsi initially you will get a certificate warning for your domain name (assuming that you're using a self-signed certificate). If this happens then select *View Certificate* and enable the checkbox to trust the certificate, then select *Continue Anyway*.  Once you've done this then the certificate warning will not appear again unless you reinstall Jitsi or use a different computer.
-
-You can also [[https://www.youtube.com/watch?v=vgx7VSrDGjk][see this video]] as an example of using OTR.
-*** Using with Ubuntu
-The default XMPP client in Ubuntu is Empathy.  Using Empathy isn't as secure as using Jitsi, since it doesn't include the /off the record/ feature, but since it's the default it's what many users will have easy access to.
-
-Open *System Settings* and select *Online Accounts*, *Add account*  and then *Jabber*.
-
-Enter your username (username@domainname) and password.
-
-Click on *Advanced* and make sure that *Encryption required* and *Ignore SSL certificate errors* are checked.  Ignoring the certificate errors will allow you to use the self-signed certificate created earlier.  Then click *Done* and set your Jabber account and Empathy to *On*.
-*** Using Tor Messenger
-Tor Messenger is a messaging client which supports XMPP, and its onion routing enables you to protect the metadata of chat interactions to some extent by making it difficult for an adversary to know which server is talking to which. You can download Tor Messenger from [[https://torproject.org][torproject.org]] and the setup is pretty simple.
-*** Using with Android/Conversations
-Install [[https://f-droid.org/][F-Droid]]
-
-Search for and install *Orbot* and *Conversations*.
-
-Add an account and enter your Jabber/XMPP ID and password.
-
-From the menu select *Settings* then *Expert Settings*. Select *Connect via Tor* and depending on your situation you might also want to select *Don't save encrypted messages*. Also within expert settings select *Keep in foreground*. This will enable you to still receive notifications when your device is in standby mode with the screen turned off.
-
-From the menu select *Manage accounts* and add a new account.
-
-#+BEGIN_SRC bash
-Jabber ID: myusername@mydomain
-Password:  your XMPP password
-Hostname:  mydomain
-Port:      5222
-#+END_SRC
-
-Then select *Next*. When chatting you can use the lock icon to encrypt your conversation. OMEMO is the recommended type of encryption. It's also going through Tor, so passive surveillance of the metadata should not be easy for an adversary.
 ** Tox
 Tox is an encrypted peer-to-peer messaging system and so should work without Freedombone. It uses a system of nodes which act as a sort of directory service allowing users to find and connect to each other. The Tox node ID on the Freedombone can be found within the README within your home directory. If you have other users connect to your node then you will be able to continue chatting even when no other nodes are available.
 *** Using the Toxic client

website/EN/app_xmpp.html

@@ -0,0 +1,514 @@
+<?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>
+<!-- 2016-11-12 Sat 21:07 -->
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<title></title>
+<meta name="generator" content="Org mode" />
+<meta name="author" content="Bob Mottram" />
+<meta name="description" content="How to use XMPP/Jabber"
+ />
+<meta name="keywords" content="freedombone, xmpp" />
+<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-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-2013 Free Software Foundation, Inc.
+
+The JavaScript code in this tag is free software: you can
+redistribute it and/or modify it under the terms of the GNU
+General Public License (GNU GPL) as published by the Free Software
+Foundation, either version 3 of the License, or (at your option)
+any later version.  The code is distributed WITHOUT ANY WARRANTY;
+without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
+
+As additional permission under GNU GPL version 3 section 7, you
+may distribute non-source (e.g., minimized or compacted) forms of
+that code without the copy of the GNU GPL normally required by
+section 4, provided you include this license notice and a URL
+through which recipients can access the Corresponding Source.
+
+
+@licend  The above is the entire license notice
+for the JavaScript code in this tag.
+*/
+<!--/*--><![CDATA[/*><!--*/
+ function CodeHighlightOn(elem, id)
+ {
+   var target = document.getElementById(id);
+   if(null != target) {
+     elem.cacheClassElem = elem.className;
+     elem.cacheClassTarget = target.className;
+     target.className = "code-highlighted";
+     elem.className   = "code-highlighted";
+   }
+ }
+ function CodeHighlightOff(elem, id)
+ {
+   var target = document.getElementById(id);
+   if(elem.cacheClassElem)
+     elem.className = elem.cacheClassElem;
+   if(elem.cacheClassTarget)
+     target.className = elem.cacheClassTarget;
+ }
+/*]]>*///-->
+</script>
+</head>
+<body>
+<div id="preamble" class="status">
+<a name="top" id="top"></a>
+</div>
+<div id="content">
+<div class="org-center">
+
+<div class="figure">
+<p><img src="images/logo.png" alt="logo.png" />
+</p>
+</div>
+</div>
+
+<center>
+<h1>XMPP/Jabber</h1>
+</center>
+
+<p>
+Most people know XMPP as "<i>Jabber</i>" and it's sometimes regarded and an old protocol once used by Google and Facebook but which is no longer relevant. However, it still works and if appropriately configured, as if is on Freedombone, can provide the best chat messaging security currently available.
+</p>
+
+<p>
+With regard to chat apps you might have read a lot of stuff about <i>end-to-end security</i>. That's important, but to also protect the metadata of who sends messages to who the data needs to be onion routed (wrapped in multiple layers of routing encryption), and that's something which most popular chat apps don't provide. Also beware of chat apps which fundamentally rely upon Google's infrastructure. You can be sure that they extensively data mine everything and will be able to reconstruct your social graph if that's at all technically feasible, then pass that to whatever governments they're friendly with or trying to lobby.
+</p>
+
+<p>
+A well written article on the state of XMPP and how it compares to other chat protocols <a href="https://gultsch.de/xmpp_2016.html">can be found here</a>.
+</p>
+
+<div id="outline-container-orgfc8b0bf" class="outline-2">
+<h2 id="orgfc8b0bf">Using with Gajim</h2>
+<div class="outline-text-2" id="text-orgfc8b0bf">
+<p>
+In mid 2016 <a href="https://gajim.org/">Gajim</a> became the first desktop XMPP client to support the <a href="https://en.wikipedia.org/wiki/OMEMO">OMEMO end-to-end security standard</a>, which is superior to the more traditional <a href="https://en.wikipedia.org/wiki/Off-the-Record_Messaging">OTR</a> since it also includes multi-user chat and the ratcheting mechanism pioneered by Open Whisper Systems. To install it:
+</p>
+
+<div class="org-src-container">
+<pre class="src src-bash">su -c <span class="org-string">'echo "deb ftp://ftp.gajim.org/debian unstable main" &gt; /etc/apt/sources.list.d/gajim.list'</span>
+sudo apt-get update
+sudo apt-get -y install gajim-dev-keyring
+sudo apt-get -y install git tor python-dev python-pip gajim-nightly
+mkdir ~/.local/share/gajim/plugins -p
+<span class="org-builtin">cd</span> ~/.local/share/gajim/plugins
+git clone https://github.com/omemo/gajim-omemo
+sudo pip install <span class="org-variable-name">protobuf</span>==2.6.1, python-axolotl==0.1.35
+</pre>
+</div>
+
+<p>
+Open Gajim and enter your XMPP address and password.
+</p>
+
+<p>
+Go to <b>Edit/Preferences</b> and select the <b>Advanced</b> tab. Under <b>Global Proxy</b> select <b>Tor</b> and the <b>Close</b> button. Then select <b>Edit/Plugins</b> and make sure that OMEMO is active (ticked), then select the <b>Close</b> button.
+</p>
+
+<p>
+When you start a conversation make sure that the OMEMO box is ticked. You can also click on the keys button and trust various fingerprints. Both sides will need to do that before an encrypted chat can start.
+</p>
+
+<p>
+If you wish to make backups of the OMEMO keys then they can be found within:
+</p>
+
+<div class="org-src-container">
+<pre class="src src-bash">~/.local/share/gajim
+</pre>
+</div>
+
+<p>
+If you wish to use OpenPGP to encrypt your messages then go to <b>Edit/Accounts</b>, select your account and then the <b>Personal Information</b> tab. You can then choose your GPG key. When initiating a chat you can select the <b>Advanced</b> button and then select <b>Toggle OpenPGP Encryption</b>. OpenPGP is not as secure as OMEMO, but does allow you to use XMPP in a similar style to email in that the recipient of the message does not necessarily need to be online at the same time that you send it.
+</p>
+</div>
+</div>
+
+<div id="outline-container-orgc35e2cb" class="outline-2">
+<h2 id="orgc35e2cb">Using with Profanity</h2>
+<div class="outline-text-2" id="text-orgc35e2cb">
+<p>
+The <a href="https://profanity.im">Profanity</a> shell based user interface and is perhaps the simplest way to use XMPP from a laptop. It's also a good way to ensure that your OTR keys are the same even when logging in from different laptops or devices, and it also means that if those devices later become compomised then there are no locally stored OTR keys to be found.
+</p>
+
+<div class="org-src-container">
+<pre class="src src-bash">ssh username@domain -p 2222
+</pre>
+</div>
+
+<p>
+Then select XMPP. Generate an <a href="https://en.wikipedia.org/wiki/Off-the-Record_Messaging">OTR</a> key with:
+</p>
+
+<div class="org-src-container">
+<pre class="src src-bash">/otr gen
+</pre>
+</div>
+
+<p>
+Then to start a conversation using OTR:
+</p>
+
+<div class="org-src-container">
+<pre class="src src-bash">/otr start otherusername@otheruserdomain
+</pre>
+</div>
+
+<p>
+or if you're already in an insecure chat with someone just use:
+</p>
+
+<div class="org-src-container">
+<pre class="src src-bash">/otr start
+</pre>
+</div>
+
+<p>
+Set a security question and answer:
+</p>
+
+<div class="org-src-container">
+<pre class="src src-bash">/otr question <span class="org-string">"What is the name of your best friends rabbit?"</span> fiffi
+</pre>
+</div>
+
+<p>
+On the other side the user can enter:
+</p>
+
+<div class="org-src-container">
+<pre class="src src-bash">/otr answer fiffi
+</pre>
+</div>
+
+<p>
+For the most paranoid you can also obtain your fingerprint:
+</p>
+
+<div class="org-src-container">
+<pre class="src src-bash">/otr myfp
+</pre>
+</div>
+
+<p>
+and quote that.  If they quote theirs back you can check it with:
+</p>
+
+<div class="org-src-container">
+<pre class="src src-bash">/otr theirfp
+</pre>
+</div>
+
+<p>
+If the fingerprints match then you can be pretty confident that unless you have been socially engineered via the question and answer you probably are talking to who you think you are, and that it will be difficult for mass surveillance systems to know the content of the conversation. For more details see <a href="https://www.profanity.im/otr.html">this guide</a>
+</p>
+
+<p>
+When accessed via the user control panel the client is automatically routed through Tor and so if you are also using OTR then this provides protection for both message content and metadata.
+</p>
+</div>
+</div>
+
+<div id="outline-container-orga90bf98" class="outline-2">
+<h2 id="orga90bf98">Using with Jitsi</h2>
+<div class="outline-text-2" id="text-orga90bf98">
+<p>
+Jitsi can be downloaded from <a href="https://jitsi.org">https://jitsi.org</a>
+</p>
+
+<p>
+On your desktop/laptop open Jitsi and select <b>Options</b> from the <b>Tools</b> menu.
+</p>
+
+<p>
+Click <b>Add</b> to add a new user, then enter the Jabber ID (yourusername@yourmaindomainname). Close and then you should notice that your status is "Online" (or if not then you should be able to set it to online).
+</p>
+
+<p>
+From the <b>File</b> menu you can add contacts, then select the chat icon to begin a chat.  Click on the lock icon on the right hand side and this will initiate an authentication procedure in which you can specify a question and answer to verify the identity of the person you're communicating with.  Once authentication is complete then you'll be chating using OTR, which provides an additional layer of security.
+</p>
+
+<p>
+When opening Jitsi initially you will get a certificate warning for your domain name (assuming that you're using a self-signed certificate). If this happens then select <b>View Certificate</b> and enable the checkbox to trust the certificate, then select <b>Continue Anyway</b>.  Once you've done this then the certificate warning will not appear again unless you reinstall Jitsi or use a different computer.
+</p>
+
+<p>
+You can also <a href="https://www.youtube.com/watch?v=vgx7VSrDGjk">see this video</a> as an example of using OTR.
+</p>
+</div>
+</div>
+
+<div id="outline-container-org0b60ac8" class="outline-2">
+<h2 id="org0b60ac8">Using with Ubuntu</h2>
+<div class="outline-text-2" id="text-org0b60ac8">
+<p>
+The default XMPP client in Ubuntu is Empathy.  Using Empathy isn't as secure as using Jitsi, since it doesn't include the <i>off the record</i> feature, but since it's the default it's what many users will have easy access to.
+</p>
+
+<p>
+Open <b>System Settings</b> and select <b>Online Accounts</b>, <b>Add account</b>  and then <b>Jabber</b>.
+</p>
+
+<p>
+Enter your username (username@domainname) and password.
+</p>
+
+<p>
+Click on <b>Advanced</b> and make sure that <b>Encryption required</b> and <b>Ignore SSL certificate errors</b> are checked.  Ignoring the certificate errors will allow you to use the self-signed certificate created earlier.  Then click <b>Done</b> and set your Jabber account and Empathy to <b>On</b>.
+</p>
+</div>
+</div>
+
+<div id="outline-container-org62a1e25" class="outline-2">
+<h2 id="org62a1e25">Using Tor Messenger</h2>
+<div class="outline-text-2" id="text-org62a1e25">
+<p>
+Tor Messenger is a messaging client which supports XMPP, and its onion routing enables you to protect the metadata of chat interactions to some extent by making it difficult for an adversary to know which server is talking to which. You can download Tor Messenger from <a href="https://torproject.org">torproject.org</a> and the setup is pretty simple.
+</p>
+</div>
+</div>
+
+<div id="outline-container-org496c82f" class="outline-2">
+<h2 id="org496c82f">Using with Android/Conversations</h2>
+<div class="outline-text-2" id="text-org496c82f">
+<p>
+Install <a href="https://f-droid.org/">F-Droid</a>
+</p>
+
+<p>
+Search for and install <b>Orbot</b> and <b>Conversations</b>.
+</p>
+
+<p>
+Add an account and enter your Jabber/XMPP ID and password.
+</p>
+
+<p>
+From the menu select <b>Settings</b> then <b>Expert Settings</b>. Select <b>Connect via Tor</b> and depending on your situation you might also want to select <b>Don't save encrypted messages</b>. Also within expert settings select <b>Keep in foreground</b>. This will enable you to still receive notifications when your device is in standby mode with the screen turned off.
+</p>
+
+<p>
+From the menu select <b>Manage accounts</b> and add a new account.
+</p>
+
+<div class="org-src-container">
+<pre class="src src-bash">Jabber ID: myusername@mydomain
+Password:  your XMPP password
+Hostname:  mydomain (preferably your xmpp onion address)
+Port:      5222
+</pre>
+</div>
+
+<p>
+Then select <b>Next</b>. When chatting you can use the lock icon to encrypt your conversation. OMEMO is the recommended type of encryption. It's also going through Tor, so passive surveillance of the metadata should not be easy for an adversary.
+</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>
-<!-- 2016-11-12 Sat 20:28 -->
+<!-- 2016-11-12 Sat 21:09 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title></title>
@@ -257,9 +257,9 @@ The base install of the system just contains an email server and Mutt client, bu
 </div>
 </div>
 
-<div id="outline-container-orgd6bca02" class="outline-2">
-<h2 id="orgd6bca02">DLNA</h2>
-<div class="outline-text-2" id="text-orgd6bca02">
+<div id="outline-container-org71853c9" class="outline-2">
+<h2 id="org71853c9">DLNA</h2>
+<div class="outline-text-2" id="text-org71853c9">
 <p>
 Enables you to use the system as a music server which any DLNA compatible devices can connect to within your home network.
 </p>
@@ -269,45 +269,45 @@ Enables you to use the system as a music server which any DLNA compatible device
 </p>
 </div>
 </div>
-<div id="outline-container-org571c0cf" class="outline-2">
-<h2 id="org571c0cf">Dokuwiki</h2>
-<div class="outline-text-2" id="text-org571c0cf">
+<div id="outline-container-org284c732" class="outline-2">
+<h2 id="org284c732">Dokuwiki</h2>
+<div class="outline-text-2" id="text-org284c732">
 <p>
 A databaseless wiki system.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org86c450f" class="outline-2">
-<h2 id="org86c450f">Emacs</h2>
-<div class="outline-text-2" id="text-org86c450f">
+<div id="outline-container-org78c9cd3" class="outline-2">
+<h2 id="org78c9cd3">Emacs</h2>
+<div class="outline-text-2" id="text-org78c9cd3">
 <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>
 </div>
 </div>
 
-<div id="outline-container-orgce869ec" class="outline-2">
-<h2 id="orgce869ec">Etherpad</h2>
-<div class="outline-text-2" id="text-orgce869ec">
+<div id="outline-container-org4bb81d0" class="outline-2">
+<h2 id="org4bb81d0">Etherpad</h2>
+<div class="outline-text-2" id="text-org4bb81d0">
 <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>
 </div>
 </div>
 
-<div id="outline-container-orgfa92334" class="outline-2">
-<h2 id="orgfa92334">Ghost</h2>
-<div class="outline-text-2" id="text-orgfa92334">
+<div id="outline-container-org7c79714" class="outline-2">
+<h2 id="org7c79714">Ghost</h2>
+<div class="outline-text-2" id="text-org7c79714">
 <p>
 Modern looking blogging system.
 </p>
 </div>
 </div>
 
-<div id="outline-container-orgd5b6c40" class="outline-2">
-<h2 id="orgd5b6c40">GNU Social</h2>
-<div class="outline-text-2" id="text-orgd5b6c40">
+<div id="outline-container-org5690a60" class="outline-2">
+<h2 id="org5690a60">GNU Social</h2>
+<div class="outline-text-2" id="text-org5690a60">
 <p>
 Federated social network. You can "<i>remote follow</i>" other users within the GNU Social federation.
 </p>
@@ -317,27 +317,27 @@ Federated social network. You can "<i>remote follow</i>" other users within the
 </p>
 </div>
 </div>
-<div id="outline-container-org5a990e6" class="outline-2">
-<h2 id="org5a990e6">Gogs</h2>
-<div class="outline-text-2" id="text-org5a990e6">
+<div id="outline-container-org7763eae" class="outline-2">
+<h2 id="org7763eae">Gogs</h2>
+<div class="outline-text-2" id="text-org7763eae">
 <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>
 </div>
 </div>
 
-<div id="outline-container-org6d858db" class="outline-2">
-<h2 id="org6d858db">HTMLy</h2>
-<div class="outline-text-2" id="text-org6d858db">
+<div id="outline-container-org08b4f3b" class="outline-2">
+<h2 id="org08b4f3b">HTMLy</h2>
+<div class="outline-text-2" id="text-org08b4f3b">
 <p>
 Databaseless blogging system. Quite simple and with a markdown-like format.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org6fad5ec" class="outline-2">
-<h2 id="org6fad5ec">Hubzilla</h2>
-<div class="outline-text-2" id="text-org6fad5ec">
+<div id="outline-container-orgc831a61" class="outline-2">
+<h2 id="orgc831a61">Hubzilla</h2>
+<div class="outline-text-2" id="text-orgc831a61">
 <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>
@@ -347,9 +347,9 @@ Web publishing platform with social network like features and good privacy contr
 </p>
 </div>
 </div>
-<div id="outline-container-org6904871" class="outline-2">
-<h2 id="org6904871">IRC Server (ngirc)</h2>
-<div class="outline-text-2" id="text-org6904871">
+<div id="outline-container-org8d57cf9" class="outline-2">
+<h2 id="org8d57cf9">IRC Server (ngirc)</h2>
+<div class="outline-text-2" id="text-org8d57cf9">
 <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>
@@ -359,81 +359,81 @@ Run your own IRC chat channel which can be secured with a password and accessibl
 </p>
 </div>
 </div>
-<div id="outline-container-org3640e06" class="outline-2">
-<h2 id="org3640e06">Jitsi Meet</h2>
-<div class="outline-text-2" id="text-org3640e06">
+<div id="outline-container-orga66cd35" class="outline-2">
+<h2 id="orga66cd35">Jitsi Meet</h2>
+<div class="outline-text-2" id="text-orga66cd35">
 <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-org9134521" class="outline-2">
-<h2 id="org9134521">Lychee</h2>
-<div class="outline-text-2" id="text-org9134521">
+<div id="outline-container-org1c021e3" class="outline-2">
+<h2 id="org1c021e3">Lychee</h2>
+<div class="outline-text-2" id="text-org1c021e3">
 <p>
 Make your photo albums available on the web.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org44a1ff5" class="outline-2">
-<h2 id="org44a1ff5">Mailpile</h2>
-<div class="outline-text-2" id="text-org44a1ff5">
+<div id="outline-container-orgfab03fc" class="outline-2">
+<h2 id="orgfab03fc">Mailpile</h2>
+<div class="outline-text-2" id="text-orgfab03fc">
 <p>
 Modern email client which supports GPG encryption.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org228ca34" class="outline-2">
-<h2 id="org228ca34">Mumble</h2>
-<div class="outline-text-2" id="text-org228ca34">
+<div id="outline-container-orgbca4bd2" class="outline-2">
+<h2 id="orgbca4bd2">Mumble</h2>
+<div class="outline-text-2" id="text-orgbca4bd2">
 <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>
 </div>
 </div>
 
-<div id="outline-container-orgeccf92f" class="outline-2">
-<h2 id="orgeccf92f">PI-Hole</h2>
-<div class="outline-text-2" id="text-orgeccf92f">
+<div id="outline-container-org323418d" class="outline-2">
+<h2 id="org323418d">PI-Hole</h2>
+<div class="outline-text-2" id="text-org323418d">
 <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>
 </div>
 </div>
 
-<div id="outline-container-orgd52fb5a" class="outline-2">
-<h2 id="orgd52fb5a">PostActiv</h2>
-<div class="outline-text-2" id="text-orgd52fb5a">
+<div id="outline-container-org3ac0b86" class="outline-2">
+<h2 id="org3ac0b86">PostActiv</h2>
+<div class="outline-text-2" id="text-org3ac0b86">
 <p>
 An alternative federated social networking system compatible with GNU Social. It includes some optimisations and fixes currently not available within the main GNU Social project.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org70d72b7" class="outline-2">
-<h2 id="org70d72b7">Radicale</h2>
-<div class="outline-text-2" id="text-org70d72b7">
+<div id="outline-container-orgd9b9c78" class="outline-2">
+<h2 id="orgd9b9c78">Radicale</h2>
+<div class="outline-text-2" id="text-orgd9b9c78">
 <p>
 Calendar system compatible with CalDAV and CardDAV. Manage your calendar events easily across all your devices.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org951789f" class="outline-2">
-<h2 id="org951789f">tt-rss</h2>
-<div class="outline-text-2" id="text-org951789f">
+<div id="outline-container-org5f5cdde" class="outline-2">
+<h2 id="org5f5cdde">tt-rss</h2>
+<div class="outline-text-2" id="text-org5f5cdde">
 <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>
 </div>
 </div>
 
-<div id="outline-container-org742baf7" class="outline-2">
-<h2 id="org742baf7">Syncthing</h2>
-<div class="outline-text-2" id="text-org742baf7">
+<div id="outline-container-orgc7e726c" class="outline-2">
+<h2 id="orgc7e726c">Syncthing</h2>
+<div class="outline-text-2" id="text-orgc7e726c">
 <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>
@@ -443,30 +443,34 @@ Possibly the best way to synchronise files across all of your devices. Once it h
 </p>
 </div>
 </div>
-<div id="outline-container-org7fa483d" class="outline-2">
-<h2 id="org7fa483d">Tox</h2>
-<div class="outline-text-2" id="text-org7fa483d">
+<div id="outline-container-org6cd29df" class="outline-2">
+<h2 id="org6cd29df">Tox</h2>
+<div class="outline-text-2" id="text-org6cd29df">
 <p>
 Client and bootstrap node for the Tox chat/VoIP system.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org1459499" class="outline-2">
-<h2 id="org1459499">Vim</h2>
-<div class="outline-text-2" id="text-org1459499">
+<div id="outline-container-org3a4951e" class="outline-2">
+<h2 id="org3a4951e">Vim</h2>
+<div class="outline-text-2" id="text-org3a4951e">
 <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-orgac0c9d6" class="outline-2">
-<h2 id="orgac0c9d6">XMPP</h2>
-<div class="outline-text-2" id="text-orgac0c9d6">
+<div id="outline-container-org6f93bbd" class="outline-2">
+<h2 id="org6f93bbd">XMPP</h2>
+<div class="outline-text-2" id="text-org6f93bbd">
 <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>
+
+<p>
+<a href="./app_xmpp.html">How to use it</a>
+</p>
 </div>
 </div>
 </div>

website/EN/usage.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>
-<!-- 2016-11-12 Sat 20:27 -->
+<!-- 2016-11-12 Sat 21:08 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title></title>
@@ -255,15 +255,15 @@ for the JavaScript code in this tag.
 </colgroup>
 <tbody>
 <tr>
-<td class="org-left"><a href="#org5bb31f9">Readme</a></td>
+<td class="org-left"><a href="#org5504d23">Readme</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgbd22da2">Improving ssh security</a></td>
+<td class="org-left"><a href="#org3aa9885">Improving ssh security</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org03083b8">Administrating the system via an onion address (Tor)</a></td>
+<td class="org-left"><a href="#org0ace22c">Administrating the system via an onion address (Tor)</a></td>
 </tr>
 
 <tr>
@@ -295,30 +295,34 @@ for the JavaScript code in this tag.
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org93777dd">Chat Services</a></td>
+<td class="org-left"><a href="./app_xmpp.html">XMPP/Jabber</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org3eb0562">RSS Reader</a></td>
+<td class="org-left"><a href="#org8e719dd">Chat Services</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org0140487">Git Projects</a></td>
+<td class="org-left"><a href="#orge398d82">RSS Reader</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org5c79868">Adding or removing users</a></td>
+<td class="org-left"><a href="#orgd2efde3">Git Projects</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgf047482">Blocking Ads</a></td>
+<td class="org-left"><a href="#org07bb2b8">Adding or removing users</a></td>
+</tr>
+
+<tr>
+<td class="org-left"><a href="#org54d698e">Blocking Ads</a></td>
 </tr>
 </tbody>
 </table>
 
-<div id="outline-container-org5bb31f9" class="outline-2">
-<h2 id="org5bb31f9">Readme</h2>
-<div class="outline-text-2" id="text-org5bb31f9">
+<div id="outline-container-org5504d23" class="outline-2">
+<h2 id="org5504d23">Readme</h2>
+<div class="outline-text-2" id="text-org5504d23">
 <p>
 After the system has installed a README file will be generated which contains passwords and some brief advice on using the installed systems. You can read this with the following commands:
 </p>
@@ -338,9 +342,9 @@ To exit you can either just close the terminal or use <b>CTRL-x CTRL-c</b> follo
 </p>
 </div>
 </div>
-<div id="outline-container-orgbd22da2" class="outline-2">
-<h2 id="orgbd22da2">Improving ssh security</h2>
-<div class="outline-text-2" id="text-orgbd22da2">
+<div id="outline-container-org3aa9885" class="outline-2">
+<h2 id="org3aa9885">Improving ssh security</h2>
+<div class="outline-text-2" id="text-org3aa9885">
 <p>
 To improve ssh security you can generate an ssh key pair on your system and then upload the public key to the Freedombone.
 </p>
@@ -390,9 +394,9 @@ If you wish to only use ssh keys then log in to the Freedombone, become the root
 </div>
 </div>
 
-<div id="outline-container-org03083b8" class="outline-2">
-<h2 id="org03083b8">Administrating the system via an onion address (Tor)</h2>
-<div class="outline-text-2" id="text-org03083b8">
+<div id="outline-container-org0ace22c" class="outline-2">
+<h2 id="org0ace22c">Administrating the system via an onion address (Tor)</h2>
+<div class="outline-text-2" id="text-org0ace22c">
 <p>
 You can also access your system via the Tor system using an onion address. To find out what the onion address for ssh access is you can do the following:
 </p>
@@ -434,257 +438,19 @@ Subsequently even if dynamic DNS isn't working you may still be able to administ
 </p>
 </div>
 </div>
-<div id="outline-container-org93777dd" class="outline-2">
-<h2 id="org93777dd">Chat Services</h2>
-<div class="outline-text-2" id="text-org93777dd">
-</div><div id="outline-container-org848d506" class="outline-3">
-<h3 id="org848d506">XMPP/Jabber</h3>
-<div class="outline-text-3" id="text-org848d506">
-</div><div id="outline-container-org05712a9" class="outline-4">
-<h4 id="org05712a9">About XMPP</h4>
-<div class="outline-text-4" id="text-org05712a9">
-<p>
-A well written article on the state of XMPP and how it compares to other chat protocols <a href="https://gultsch.de/xmpp_2016.html">can be found here</a>.
-</p>
-</div>
-</div>
-<div id="outline-container-org063f13a" class="outline-4">
-<h4 id="org063f13a">Using with Gajim</h4>
-<div class="outline-text-4" id="text-org063f13a">
-<p>
-In mid 2016 <a href="https://gajim.org/">Gajim</a> became the first desktop XMPP client to support the <a href="https://en.wikipedia.org/wiki/OMEMO">OMEMO end-to-end security standard</a>, which is superior to the more traditional <a href="https://en.wikipedia.org/wiki/Off-the-Record_Messaging">OTR</a> since it also includes multi-user chat and the ratcheting mechanism pioneered by Open Whisper Systems. To install it:
-</p>
-
-<div class="org-src-container">
-<pre class="src src-bash">su -c <span class="org-string">'echo "deb ftp://ftp.gajim.org/debian unstable main" &gt; /etc/apt/sources.list.d/gajim.list'</span>
-sudo apt-get update
-sudo apt-get -y install gajim-dev-keyring
-sudo apt-get -y install git tor python-dev python-pip gajim-nightly
-mkdir ~/.local/share/gajim/plugins -p
-<span class="org-builtin">cd</span> ~/.local/share/gajim/plugins
-git clone https://github.com/omemo/gajim-omemo
-sudo pip install <span class="org-variable-name">protobuf</span>==2.6.1, python-axolotl==0.1.35
-</pre>
-</div>
-
-<p>
-Open Gajim and enter your XMPP address and password.
-</p>
-
-<p>
-Go to <b>Edit/Preferences</b> and select the <b>Advanced</b> tab. Under <b>Global Proxy</b> select <b>Tor</b> and the <b>Close</b> button. Then select <b>Edit/Plugins</b> and make sure that OMEMO is active (ticked), then select the <b>Close</b> button.
-</p>
-
-<p>
-When you start a conversation make sure that the OMEMO box is ticked. You can also click on the keys button and trust various fingerprints. Both sides will need to do that before an encrypted chat can start.
-</p>
-
-<p>
-If you wish to make backups of the OMEMO keys then they can be found within:
-</p>
-
-<div class="org-src-container">
-<pre class="src src-bash">~/.local/share/gajim
-</pre>
-</div>
-
-<p>
-If you wish to use OpenPGP to encrypt your messages then go to <b>Edit/Accounts</b>, select your account and then the <b>Personal Information</b> tab. You can then choose your GPG key. When initiating a chat you can select the <b>Advanced</b> button and then select <b>Toggle OpenPGP Encryption</b>. OpenPGP is not as secure as OMEMO, but does allow you to use XMPP in a similar style to email in that the recipient of the message does not necessarily need to be online at the same time that you send it.
-</p>
-</div>
-</div>
-
-<div id="outline-container-orge5efeff" class="outline-4">
-<h4 id="orge5efeff">Using with Profanity</h4>
-<div class="outline-text-4" id="text-orge5efeff">
-<p>
-The <a href="https://profanity.im">Profanity</a> shell based user interface and is perhaps the simplest way to use XMPP from a laptop. It's also a good way to ensure that your OTR keys are the same even when logging in from different laptops or devices, and it also means that if those devices later become compomised then there are no locally stored OTR keys to be found.
-</p>
-
-<div class="org-src-container">
-<pre class="src src-bash">ssh username@domain -p 2222
-</pre>
-</div>
-
-<p>
-Then select XMPP. Generate an <a href="https://en.wikipedia.org/wiki/Off-the-Record_Messaging">OTR</a> key with:
-</p>
-
-<div class="org-src-container">
-<pre class="src src-bash">/otr gen
-</pre>
-</div>
-
-<p>
-Then to start a conversation using OTR:
-</p>
-
-<div class="org-src-container">
-<pre class="src src-bash">/otr start otherusername@otheruserdomain
-</pre>
-</div>
-
-<p>
-or if you're already in an insecure chat with someone just use:
-</p>
-
-<div class="org-src-container">
-<pre class="src src-bash">/otr start
-</pre>
-</div>
-
-<p>
-Set a security question and answer:
-</p>
-
-<div class="org-src-container">
-<pre class="src src-bash">/otr question <span class="org-string">"What is the name of your best friends rabbit?"</span> fiffi
-</pre>
-</div>
-
-<p>
-On the other side the user can enter:
-</p>
-
-<div class="org-src-container">
-<pre class="src src-bash">/otr answer fiffi
-</pre>
-</div>
-
-<p>
-For the most paranoid you can also obtain your fingerprint:
-</p>
-
-<div class="org-src-container">
-<pre class="src src-bash">/otr myfp
-</pre>
-</div>
-
-<p>
-and quote that.  If they quote theirs back you can check it with:
-</p>
-
-<div class="org-src-container">
-<pre class="src src-bash">/otr theirfp
-</pre>
-</div>
-
-<p>
-If the fingerprints match then you can be pretty confident that unless you have been socially engineered via the question and answer you probably are talking to who you think you are, and that it will be difficult for mass surveillance systems to know the content of the conversation. For more details see <a href="https://www.profanity.im/otr.html">this guide</a>
-</p>
-
-<p>
-When accessed via the user control panel the client is automatically routed through Tor and so if you are also using OTR then this provides protection for both message content and metadata.
-</p>
-</div>
-</div>
-<div id="outline-container-org1243af3" class="outline-4">
-<h4 id="org1243af3">Using with Jitsi</h4>
-<div class="outline-text-4" id="text-org1243af3">
-<p>
-Jitsi is the recommended communications client for desktop or laptop systems, since it includes the <i>off the record</i> (OTR) feature which provides some additional security beyond the usual SSL certificates.
-</p>
-
-<p>
-Jitsi can be downloaded from <a href="https://jitsi.org">https://jitsi.org</a>
-</p>
-
-<p>
-On your desktop/laptop open Jitsi and select <b>Options</b> from the <b>Tools</b> menu.
-</p>
-
-<p>
-Click <b>Add</b> to add a new user, then enter the Jabber ID which you previously specified with <i>prosodyctl</i> when setting up the XMPP server. Close and then you should notice that your status is "Online" (or if not then you should be able to set it to online).
-</p>
-
-<p>
-From the <b>File</b> menu you can add contacts, then select the chat icon to begin a chat.  Click on the lock icon on the right hand side and this will initiate an authentication procedure in which you can specify a question and answer to verify the identity of the person you're communicating with.  Once authentication is complete then you'll be chating using OTR, which provides an additional layer of security.
-</p>
-
-<p>
-When opening Jitsi initially you will get a certificate warning for your domain name (assuming that you're using a self-signed certificate). If this happens then select <b>View Certificate</b> and enable the checkbox to trust the certificate, then select <b>Continue Anyway</b>.  Once you've done this then the certificate warning will not appear again unless you reinstall Jitsi or use a different computer.
-</p>
-
-<p>
-You can also <a href="https://www.youtube.com/watch?v=vgx7VSrDGjk">see this video</a> as an example of using OTR.
-</p>
-</div>
-</div>
-<div id="outline-container-org26e4d0c" class="outline-4">
-<h4 id="org26e4d0c">Using with Ubuntu</h4>
-<div class="outline-text-4" id="text-org26e4d0c">
-<p>
-The default XMPP client in Ubuntu is Empathy.  Using Empathy isn't as secure as using Jitsi, since it doesn't include the <i>off the record</i> feature, but since it's the default it's what many users will have easy access to.
-</p>
-
-<p>
-Open <b>System Settings</b> and select <b>Online Accounts</b>, <b>Add account</b>  and then <b>Jabber</b>.
-</p>
-
-<p>
-Enter your username (username@domainname) and password.
-</p>
-
-<p>
-Click on <b>Advanced</b> and make sure that <b>Encryption required</b> and <b>Ignore SSL certificate errors</b> are checked.  Ignoring the certificate errors will allow you to use the self-signed certificate created earlier.  Then click <b>Done</b> and set your Jabber account and Empathy to <b>On</b>.
-</p>
-</div>
-</div>
-<div id="outline-container-org0d31b4f" class="outline-4">
-<h4 id="org0d31b4f">Using Tor Messenger</h4>
-<div class="outline-text-4" id="text-org0d31b4f">
-<p>
-Tor Messenger is a messaging client which supports XMPP, and its onion routing enables you to protect the metadata of chat interactions to some extent by making it difficult for an adversary to know which server is talking to which. You can download Tor Messenger from <a href="https://torproject.org">torproject.org</a> and the setup is pretty simple.
-</p>
-</div>
-</div>
-<div id="outline-container-org205f4a5" class="outline-4">
-<h4 id="org205f4a5">Using with Android/Conversations</h4>
-<div class="outline-text-4" id="text-org205f4a5">
-<p>
-Install <a href="https://f-droid.org/">F-Droid</a>
-</p>
-
-<p>
-Search for and install <b>Orbot</b> and <b>Conversations</b>.
-</p>
-
-<p>
-Add an account and enter your Jabber/XMPP ID and password.
-</p>
-
-<p>
-From the menu select <b>Settings</b> then <b>Expert Settings</b>. Select <b>Connect via Tor</b> and depending on your situation you might also want to select <b>Don't save encrypted messages</b>. Also within expert settings select <b>Keep in foreground</b>. This will enable you to still receive notifications when your device is in standby mode with the screen turned off.
-</p>
-
-<p>
-From the menu select <b>Manage accounts</b> and add a new account.
-</p>
-
-<div class="org-src-container">
-<pre class="src src-bash">Jabber ID: myusername@mydomain
-Password:  your XMPP password
-Hostname:  mydomain
-Port:      5222
-</pre>
-</div>
-
-<p>
-Then select <b>Next</b>. When chatting you can use the lock icon to encrypt your conversation. OMEMO is the recommended type of encryption. It's also going through Tor, so passive surveillance of the metadata should not be easy for an adversary.
-</p>
-</div>
-</div>
-</div>
-<div id="outline-container-orgd56650b" class="outline-3">
-<h3 id="orgd56650b">Tox</h3>
-<div class="outline-text-3" id="text-orgd56650b">
+<div id="outline-container-org8e719dd" class="outline-2">
+<h2 id="org8e719dd">Chat Services</h2>
+<div class="outline-text-2" id="text-org8e719dd">
+</div><div id="outline-container-orgfd9b41d" class="outline-3">
+<h3 id="orgfd9b41d">Tox</h3>
+<div class="outline-text-3" id="text-orgfd9b41d">
 <p>
 Tox is an encrypted peer-to-peer messaging system and so should work without Freedombone. It uses a system of nodes which act as a sort of directory service allowing users to find and connect to each other. The Tox node ID on the Freedombone can be found within the README within your home directory. If you have other users connect to your node then you will be able to continue chatting even when no other nodes are available.
 </p>
 </div>
-<div id="outline-container-orga52b252" class="outline-4">
-<h4 id="orga52b252">Using the Toxic client</h4>
-<div class="outline-text-4" id="text-orga52b252">
+<div id="outline-container-org316675e" class="outline-4">
+<h4 id="org316675e">Using the Toxic client</h4>
+<div class="outline-text-4" id="text-org316675e">
 <p>
 Log into your system with:
 </p>
@@ -707,20 +473,20 @@ Then from the menu select <b>Tox Chat</b>. Tox is encrypted by default and also
 </div>
 </div>
 
-<div id="outline-container-orge804b5d" class="outline-3">
-<h3 id="orge804b5d">VoIP (Voice and text chat)</h3>
-<div class="outline-text-3" id="text-orge804b5d">
-</div><div id="outline-container-org3f66035" class="outline-4">
-<h4 id="org3f66035">Text chat</h4>
-<div class="outline-text-4" id="text-org3f66035">
+<div id="outline-container-org62321a2" class="outline-3">
+<h3 id="org62321a2">VoIP (Voice and text chat)</h3>
+<div class="outline-text-3" id="text-org62321a2">
+</div><div id="outline-container-orgaff6ffe" class="outline-4">
+<h4 id="orgaff6ffe">Text chat</h4>
+<div class="outline-text-4" id="text-orgaff6ffe">
 <p>
 In addition to voice it is also possible to do text chat via mumble. The security of this is pretty good provided that you do it via Plumble and Orbot on mobile, but compared to other options such as XMPP/Conversations or Tox the security is not as good, since the mumble server currently doesn't support forward secrecy.
 </p>
 </div>
 </div>
-<div id="outline-container-org89b03bc" class="outline-4">
-<h4 id="org89b03bc">Using with Ubuntu</h4>
-<div class="outline-text-4" id="text-org89b03bc">
+<div id="outline-container-orgd01c29a" class="outline-4">
+<h4 id="orgd01c29a">Using with Ubuntu</h4>
+<div class="outline-text-4" id="text-orgd01c29a">
 <p>
 Within the software center search for "mumble" and install the client then run it. Skip through the audio setup wizard.
 </p>
@@ -730,9 +496,9 @@ Click on "add new" to add a new server and enter the default domain name for the
 </p>
 </div>
 </div>
-<div id="outline-container-org85a5327" class="outline-4">
-<h4 id="org85a5327">Using with Android</h4>
-<div class="outline-text-4" id="text-org85a5327">
+<div id="outline-container-org6f20c3a" class="outline-4">
+<h4 id="org6f20c3a">Using with Android</h4>
+<div class="outline-text-4" id="text-org6f20c3a">
 <p>
 Install <a href="https://f-droid.org/">F-Droid</a>
 </p>
@@ -767,24 +533,24 @@ Selecting the server by pressing on it then connects you to the server so that y
 </div>
 </div>
 </div>
-<div id="outline-container-org7b7a25c" class="outline-3">
-<h3 id="org7b7a25c">SIP phones</h3>
-<div class="outline-text-3" id="text-org7b7a25c">
+<div id="outline-container-org9248580" class="outline-3">
+<h3 id="org9248580">SIP phones</h3>
+<div class="outline-text-3" id="text-org9248580">
 <p>
 Freedombone also supports SIP phones The username and domain is the same as for your email address, and the SIP password and extension number will appear within the README file in your home directory. Various SIP client options are available, such as CSipSimple on Android and Jitsi on desktop or laptop machines. Ideally use clients which support ZRTP, which will provide the best level of security.
 </p>
 </div>
-<div id="outline-container-orgbb92679" class="outline-4">
-<h4 id="orgbb92679">About ZRTP</h4>
-<div class="outline-text-4" id="text-orgbb92679">
+<div id="outline-container-org6941885" class="outline-4">
+<h4 id="org6941885">About ZRTP</h4>
+<div class="outline-text-4" id="text-org6941885">
 <p>
 <a href="https://jitsi.org/Documentation/ZrtpFAQ">ZRTP</a> appears to be the current best standard to end-to-end encrypted voice calls, combining good security with simplicity of use. When the initial cryptographic negotiation between phones is done at the start of a call a short authentication string (SAS) is calculated and displayed at both ends. To check that there isn't anyone intercepting the call and acting as a <i>man in the middle</i> - as <a href="https://en.wikipedia.org/wiki/Stingray_phone_tracker">stingray type devices</a> try to do - the short authentication string can be read out and verbally confirmed between the callers. If it's the same then you can be pretty confident that the call is secure.
 </p>
 </div>
 </div>
-<div id="outline-container-org8e84902" class="outline-4">
-<h4 id="org8e84902">Using with CSIPSimple</h4>
-<div class="outline-text-4" id="text-org8e84902">
+<div id="outline-container-org3d8f178" class="outline-4">
+<h4 id="org3d8f178">Using with CSIPSimple</h4>
+<div class="outline-text-4" id="text-org3d8f178">
 <p>
 Add an account. Under <b>General Wizards</b> choose <b>Expert</b> and enter the following details:
 </p>
@@ -840,9 +606,9 @@ If everything is working the account should appear in green with a status of <b>
 </p>
 </div>
 </div>
-<div id="outline-container-org89e6c64" class="outline-4">
-<h4 id="org89e6c64">Using with Ring</h4>
-<div class="outline-text-4" id="text-org89e6c64">
+<div id="outline-container-org4201792" class="outline-4">
+<h4 id="org4201792">Using with Ring</h4>
+<div class="outline-text-4" id="text-org4201792">
 <p>
 From the menu select <b>Manage accounts</b>.
 </p>
@@ -895,9 +661,9 @@ Select the <b>Security</b> tab. Under <b>SRTP Key Exchange</b> select <b>ZRTP</b
 </div>
 </div>
 
-<div id="outline-container-org3eb0562" class="outline-2">
-<h2 id="org3eb0562">RSS Reader</h2>
-<div class="outline-text-2" id="text-org3eb0562">
+<div id="outline-container-orge398d82" class="outline-2">
+<h2 id="orge398d82">RSS Reader</h2>
+<div class="outline-text-2" id="text-orge398d82">
 <p>
 The way that RSS reading is set up on Freedombone gives you strong reading privacy. Not only is there onion routing between you and the server but also between the server and the source of the RSS feed. The only down side is that many RSS feeds are still http only, and so could be vulnerable to injection attacks, but it's expected that more of this will go to https in the foreseeable future due to a combination of growing recognition of security issues and systems like Let's Encrypt which make obtaining certificates much easier.
 </p>
@@ -909,9 +675,9 @@ The way that RSS reading is set up on Freedombone gives you strong reading priva
 </div>
 </div>
 
-<div id="outline-container-org45ca393" class="outline-3">
-<h3 id="org45ca393">Finding the onion address</h3>
-<div class="outline-text-3" id="text-org45ca393">
+<div id="outline-container-org7118e6c" class="outline-3">
+<h3 id="org7118e6c">Finding the onion address</h3>
+<div class="outline-text-3" id="text-org7118e6c">
 <p>
 See the control panel for the RSS reader onion address.
 </p>
@@ -935,9 +701,9 @@ To set up the system open <a href="http://rss_reader_onion_address">http://rss_r
 </div>
 </div>
 
-<div id="outline-container-org0814faa" class="outline-3">
-<h3 id="org0814faa">On mobile</h3>
-<div class="outline-text-3" id="text-org0814faa">
+<div id="outline-container-org9ff93d4" class="outline-3">
+<h3 id="org9ff93d4">On mobile</h3>
+<div class="outline-text-3" id="text-org9ff93d4">
 <p>
 To access the RSS reader from a mobile device you can install a Tor compatible browser such as OrFox. It will try to automatically change to the mobile version of the user interface. Remember to add the site to the NoScript whitelist, and you may also need to turn HTTPS Everywhere off.
 </p>
@@ -949,9 +715,9 @@ A note for the paranoid is that on mobile devices you get redirected to a differ
 </blockquote>
 </div>
 </div>
-<div id="outline-container-org4f142b0" class="outline-3">
-<h3 id="org4f142b0">With Emacs</h3>
-<div class="outline-text-3" id="text-org4f142b0">
+<div id="outline-container-orga9ff6cf" class="outline-3">
+<h3 id="orga9ff6cf">With Emacs</h3>
+<div class="outline-text-3" id="text-orga9ff6cf">
 <p>
 If you are an Emacs user then you can also read your RSS feeds via the <a href="https://github.com/dk87/avandu">Avandu</a> mode.
 </p>
@@ -990,9 +756,9 @@ And ensure that the Tor daemon is installed:
 </div>
 </div>
 </div>
-<div id="outline-container-org0140487" class="outline-2">
-<h2 id="org0140487">Git Projects</h2>
-<div class="outline-text-2" id="text-org0140487">
+<div id="outline-container-orgd2efde3" class="outline-2">
+<h2 id="orgd2efde3">Git Projects</h2>
+<div class="outline-text-2" id="text-orgd2efde3">
 <p>
 Github is ok, but it's proprietary and funded by venture capital. If you been around on the internet for long enough then you know how this story eventually works itself out - i.e. badly for the users. It's really only a question of time. If you're a software developer or do things which involve the Git version control system then it's a good idea to become accustomed to hosting your own repositories, before the inevitable Github shitstorm happens.
 </p>
@@ -1028,9 +794,9 @@ This will stop any spam accounts being created by random strangers or bots. You
 </p>
 </div>
 </div>
-<div id="outline-container-org5c79868" class="outline-2">
-<h2 id="org5c79868">Adding or removing users</h2>
-<div class="outline-text-2" id="text-org5c79868">
+<div id="outline-container-org07bb2b8" class="outline-2">
+<h2 id="org07bb2b8">Adding or removing users</h2>
+<div class="outline-text-2" id="text-org07bb2b8">
 <p>
 Log into the system with:
 </p>
@@ -1058,9 +824,9 @@ control
 </div>
 </div>
 
-<div id="outline-container-orgf047482" class="outline-2">
-<h2 id="orgf047482">Blocking Ads</h2>
-<div class="outline-text-2" id="text-orgf047482">
+<div id="outline-container-org54d698e" class="outline-2">
+<h2 id="org54d698e">Blocking Ads</h2>
+<div class="outline-text-2" id="text-org54d698e">
 <p>
 Everyone except for advertisers hates adverts. Not only are they annoying, but they can consume a lot of bandwidth, be a privacy problem in terms of allowing companies to track your browsing habits and also any badly written scripts they contain may introduce exploitable security holes. Also if you're poor then adverts often make you want things that you can't have.
 </p>
@@ -1074,9 +840,9 @@ Also don't expect perfection. Though many ads may be blocked by this system some
 </p>
 </div>
 
-<div id="outline-container-org9407dca" class="outline-3">
-<h3 id="org9407dca">Set a static IP address</h3>
-<div class="outline-text-3" id="text-org9407dca">
+<div id="outline-container-orgc3683e3" class="outline-3">
+<h3 id="orgc3683e3">Set a static IP address</h3>
+<div class="outline-text-3" id="text-orgc3683e3">
 <p>
 Ensure that your system has a static local IP address (typically 192.168..) using the option on the control panel. You will also need to know the IP address of your internet router, which is usually <b>192.168.1.1</b> or <b>192.168.1.254</b>.
 </p>
@@ -1087,9 +853,9 @@ When that's done select <b>About this system</b> from the control panel and see
 </div>
 </div>
 
-<div id="outline-container-org4309453" class="outline-3">
-<h3 id="org4309453">On each client system within your local network</h3>
-<div class="outline-text-3" id="text-org4309453">
+<div id="outline-container-org7df7a53" class="outline-3">
+<h3 id="org7df7a53">On each client system within your local network</h3>
+<div class="outline-text-3" id="text-org7df7a53">
 <div class="org-src-container">
 <pre class="src src-bash">sudo chattr -i /etc/resolv.conf
 sudo nano /etc/resolv.conf
@@ -1116,9 +882,9 @@ Normally <i>resolv.conf</i> will be overwritten every time your reboot, but you
 </div>
 </div>
 
-<div id="outline-container-org22c1431" class="outline-3">
-<h3 id="org22c1431">On your internet router</h3>
-<div class="outline-text-3" id="text-org22c1431">
+<div id="outline-container-org58db9c9" class="outline-3">
+<h3 id="org58db9c9">On your internet router</h3>
+<div class="outline-text-3" id="text-org58db9c9">
 <p>
 If you can access the settings on your local internet router then this is the simplest way to provide ad blocking for all devices which connect to it. Unfortunately some router models don't let you edit the DNS settings and if that's the case you might want to consider getting a different router.
 </p>
@@ -1128,9 +894,9 @@ Edit the DNS settings and add the IPv4 address which you got from the control pa
 </p>
 </div>
 
-<div id="outline-container-org6c4afef" class="outline-4">
-<h4 id="org6c4afef">LibreCMC</h4>
-<div class="outline-text-4" id="text-org6c4afef">
+<div id="outline-container-org6cfdab6" class="outline-4">
+<h4 id="org6cfdab6">LibreCMC</h4>
+<div class="outline-text-4" id="text-org6cfdab6">
 <p>
 On a router running LibreCMC from the <b>Network</b> menu select <b>DHCP and DNS</b>. Enter the static IP address of your Freedombone system within <b>DNS Forwardings</b>, then at the bottom of the page click on <b>Save &amp; Apply</b>. Any devices which connect to your router will now have ad blocking.
 </p>
@@ -1138,9 +904,9 @@ On a router running LibreCMC from the <b>Network</b> menu select <b>DHCP and DNS
 </div>
 </div>
 
-<div id="outline-container-org987a1ad" class="outline-3">
-<h3 id="org987a1ad">Configuring block lists</h3>
-<div class="outline-text-3" id="text-org987a1ad">
+<div id="outline-container-orgf97e7b7" class="outline-3">
+<h3 id="orgf97e7b7">Configuring block lists</h3>
+<div class="outline-text-3" id="text-orgf97e7b7">
 <p>
 You can configure the block lists which the system uses by going to the <b>administrator control panel</b>, selecting <b>App Settings</b> then choosing <b>pihole</b>. You can also add any extra domain names to the whitelist if they're being wrongly blocked or to the blacklist if they're not blocked by the current lists.
 </p>