Separate documentation for dlna

doc/EN/app_dlna.org

@@ -0,0 +1,33 @@
+#+TITLE:
+#+AUTHOR: Bob Mottram
+#+EMAIL: bob@freedombone.net
+#+KEYWORDS: freedombone, dlna
+#+DESCRIPTION: How to use DLNA
+#+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>DLNA</h1>
+</center>
+#+END_EXPORT
+
+An easy way to play music on any mobile device in your home is to use the DLNA service. Copy your music into a directory called "/Music/" on an unencrypted USB thumb drive and then insert it into a USB socket on the Freedombone system.
+
+ssh into the system with:
+
+#+BEGIN_SRC bash
+ssh myusername@mydomain.com -p 2222
+#+END_SRC
+
+Select *Administrator controls* then *App Settings* then *dlna*. From there you can choose to attach the drive.
+
+The system will scan the /Music/ directory, which could take a while if there are thousands of files, but you don't need to do anything further other than perhaps to log out by selecting *Exit* a couple of times.
+
+If you have an Android device then go to F-Droid (if you don't already have it installed then it can be [[https://f-droid.org/][downloaded here]]) and search for *ControlDLNA*. On running the app you should see a red Debian icon which you can press on, then you may need to select "local". After a few seconds the list of albums or tracks should then appear and you can browse and play them.
+
+The DLNA service will only work within your local home network, and isn't remotely accessible from other locations via the internet. That can be both a good and a bad thing. Another consideration is that there are /no access controls/ on DLNA services, so any music or videos on the USB drive will be playable by anyone within your home network.

doc/EN/apps.org

@@ -23,6 +23,7 @@ The base install of the system just contains an email server and Mutt client, bu
 * DLNA
 Enables you to use the system as a music server which any DLNA compatible devices can connect to within your home network.
 
+[[./app_dlna.html][How to use it]]
 * Dokuwiki
 A databaseless wiki system.
 

doc/EN/usage.org

@@ -22,7 +22,7 @@
 | [[./mobile.html][Mobile advice]]                                        |
 | [[./usage_email.html][Using Email]]                                          |
 | [[./app_syncthing.html][Syncing to the Cloud]]                                 |
-| [[Play Music]]                                           |
+| [[./app_dlna.html][Play Music]]                                           |
 | [[./app_gnusocial.html][Microblogging (GNU Social)]]                           |
 | [[./app_hubzilla.html][Social Network]]                                       |
 | [[Chat Services]]                                        |
@@ -97,29 +97,6 @@ ssh username@address.onion -p 2222
 #+END_SRC
 
 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.
-* Play Music
-** With the DLNA service
-An easy way to play music on any mobile device in your home is to use the DLNA service. Copy your music into a directory called "/Music/" on a USB thumb drive and then insert it into from socket on the Beaglebone.
-
-ssh into the system with:
-
-#+BEGIN_SRC bash
-ssh myusername@mydomain.com -p 2222
-#+END_SRC
-
-Then mount the USB drive with:
-
-#+BEGIN_SRC bash
-su
-attach-music
-#+END_SRC
-
-The system will scan the Music directory, which could take a while if there are thousands of files, but you don't need to do anything further with the Beaglebone other than perhaps to log out by typing *exit* a couple of times.
-
-If you have an Android device then go to F-Droid (if you don't already have it installed then it can be [[https://f-droid.org/][downloaded here]]) and search for *ControlDLNA*. On running the app you should see a red Debian icon which you can press on, then you may need to select "local". After a few seconds the list of albums or tracks should then appear and you can browse and play them.
-
-The DLNA service will only work within your local home network, and isn't remotely accessible from other locations via the internet. That can be both a good and a bad thing. Another consideration is that there are no access controls on DLNA services, so any music or videos on the USB drive will be playable by anyone within your home network.
-
 * Chat Services
 ** IRC
 IRC is useful for multi-user chat. The classic use case is for software development where many engineers might need to coordinate their activities, but it's also useful for meetings, parties and general socialising.

src/freedombone-app-dlna

@@ -33,7 +33,7 @@ VARIANTS='full full-vim media'
 IN_DEFAULT_INSTALL=0
 
 dlna_variables=(SYSTEM_TYPE
-                USB_MOUNT
+                USB_MOUNT_DLNA
                 INSTALLED_WITHIN_DOCKER
                 MY_USERNAME)
 
@@ -54,8 +54,7 @@ function configure_interactive_dlna {
             255) break;;
         esac
         case $(cat $data) in
-            1) remove-music
-               attach-music;;
+            1) attach-music;;
             2) remove-music;;
             3) break;;
         esac
@@ -104,7 +103,7 @@ function backup_local_dlna {
 
 function restore_local_dlna {
     if [ -d /var/cache/minidlna ]; then
-        if [ -d $USB_MOUNT/backup/dlna ]; then
+        if [ -d $USB_MOUNT_DLNA/backup/dlna ]; then
             echo $"Restoring DLNA cache"
             temp_restore_dir=/root/tempdlna
             function_check restore_directory_from_usb
@@ -125,16 +124,13 @@ function restore_local_dlna {
 
 function backup_remote_dlna {
     if [ -d /var/cache/minidlna ]; then
-        echo $"Backing up DLNA cache"
         backup_directory_to_friend /var/cache/minidlna dlna
-        echo $"Backup of DLNA cache complete"
     fi
 }
 
 function restore_remote_dlna {
     if [ -d /var/cache/minidlna ]; then
         if [ -d $SERVER_DIRECTORY/backup/dlna ]; then
-            echo $"Restoring DLNA cache"
             temp_restore_dir=/root/tempdlna
             function_check restore_directory_from_friend
             restore_directory_from_friend $temp_restore_dir dlna
@@ -143,17 +139,18 @@ function restore_remote_dlna {
                 exit 982
             fi
             rm -rf $temp_restore_dir
-            echo $"Restore of DLNA complete"
         fi
     fi
 }
 
 function remove_dlna {
-    service minidlna stop
+    systemctl stop minidlna
     apt-get -yq remove --purge minidlna
     if [ -f /etc/minidlna.conf ]; then
         rm /etc/minidlna.conf
     fi
+    rm /usr/bin/attach-music
+    rm /usr/bin/remove-music
     remove_completion_param install_dlna
     firewall_remove 1900 udp
     firewall_remove 8200 tcp
@@ -171,6 +168,13 @@ function install_dlna_main {
         exit 55
     fi
 
+    if [ ! $USB_MOUNT_DLNA ]; then
+        USB_MOUNT_DLNA=/mnt/dlna
+    fi
+    if [ ${#USB_MOUNT_DLNA} -eq 0 ]; then
+        USB_MOUNT_DLNA=/mnt/dlna
+    fi
+
     sed -i "s|media_dir=/var/lib/minidlna|media_dir=A,/home/$MY_USERNAME/Music|g" /etc/minidlna.conf
     if ! grep -q "/home/$MY_USERNAME/Pictures" /etc/minidlna.conf; then
         echo "media_dir=P,/home/$MY_USERNAME/Pictures" >> /etc/minidlna.conf
@@ -178,14 +182,14 @@ function install_dlna_main {
     if ! grep -q "/home/$MY_USERNAME/Videos" /etc/minidlna.conf; then
         echo "media_dir=V,/home/$MY_USERNAME/Videos" >> /etc/minidlna.conf
     fi
-    if ! grep -q "$USB_MOUNT/Music" /etc/minidlna.conf; then
-        echo "media_dir=A,$USB_MOUNT/Music" >> /etc/minidlna.conf
+    if ! grep -q "$USB_MOUNT_DLNA/Music" /etc/minidlna.conf; then
+        echo "media_dir=A,$USB_MOUNT_DLNA/Music" >> /etc/minidlna.conf
     fi
-    if ! grep -q "$USB_MOUNT/Pictures" /etc/minidlna.conf; then
-        echo "media_dir=P,$USB_MOUNT/Pictures" >> /etc/minidlna.conf
+    if ! grep -q "$USB_MOUNT_DLNA/Pictures" /etc/minidlna.conf; then
+        echo "media_dir=P,$USB_MOUNT_DLNA/Pictures" >> /etc/minidlna.conf
     fi
-    if ! grep -q "$USB_MOUNT/Videos" /etc/minidlna.conf; then
-        echo "media_dir=V,$USB_MOUNT/Videos" >> /etc/minidlna.conf
+    if ! grep -q "$USB_MOUNT_DLNA/Videos" /etc/minidlna.conf; then
+        echo "media_dir=V,$USB_MOUNT_DLNA/Videos" >> /etc/minidlna.conf
     fi
     sed -i 's/#root_container=./root_container=B/g' /etc/minidlna.conf
     if [[ $SYSTEM_TYPE != "mesh"* ]]; then
@@ -202,8 +206,7 @@ function install_dlna_main {
     sed -i 's/#inotify=yes/inotify=yes/g' /etc/minidlna.conf
     sed -i 's/#notify_interval=895/notify_interval=300/g' /etc/minidlna.conf
     sed -i "s|#presentation_url=/|presentation_url=http://localhost:8200|g" /etc/minidlna.conf
-    service minidlna force-reload
-    service minidlna reload
+    systemctl reload minidlna
 
     sed -i 's/fs.inotify.max_user_watches*/fs.inotify.max_user_watches=65536/g' /etc/sysctl.conf
     if ! grep -q "max_user_watches" $COMPLETION_FILE; then
@@ -221,36 +224,37 @@ function script_for_attaching_usb_drive {
         return
     fi
     echo '#!/bin/bash' > /usr/bin/attach-music
+    echo "source /usr/local/bin/${PROJECT_NAME}-vars" >> /usr/bin/attach-music
+    echo "UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*" >> /usr/bin/attach-music
+    echo '' >> /usr/bin/attach-music
+    echo 'for f in $UTILS_FILES' >> /usr/bin/attach-music
+    echo 'do' >> /usr/bin/attach-music
+    echo '    source $f' >> /usr/bin/attach-music
+    echo 'done' >> /usr/bin/attach-music
+    echo '' >> /usr/bin/attach-music
+    echo 'USB_DRIVE=/dev/sda1' >> /usr/bin/attach-music
+    echo 'detect_usb_drive' >> /usr/bin/attach-music
+    echo '' >> /usr/bin/attach-music
     echo 'remove-music' >> /usr/bin/attach-music
-    echo "if [ ! -d $USB_MOUNT ]; then" >> /usr/bin/attach-music
-    echo "  mkdir $USB_MOUNT" >> /usr/bin/attach-music
+    echo "if [ ! -d $USB_MOUNT_DLNA ]; then" >> /usr/bin/attach-music
+    echo "    mkdir $USB_MOUNT_DLNA" >> /usr/bin/attach-music
     echo 'fi' >> /usr/bin/attach-music
-    echo "mount /dev/sda1 $USB_MOUNT" >> /usr/bin/attach-music
-    echo "chown root:root $USB_MOUNT" >> /usr/bin/attach-music
-    echo "chown -R minidlna:minidlna $USB_MOUNT/*" >> /usr/bin/attach-music
-    echo 'service minidlna restart' >> /usr/bin/attach-music
+    echo -n 'mount $USB_DRIVE ' >> /usr/bin/attach-music
+    echo "$USB_MOUNT_DLNA" >> /usr/bin/attach-music
+    echo "chown root:root $USB_MOUNT_DLNA" >> /usr/bin/attach-music
+    echo "chown -R minidlna:minidlna $USB_MOUNT_DLNA/*" >> /usr/bin/attach-music
+    echo 'systemctl restart minidlna' >> /usr/bin/attach-music
     echo 'minidlnad -R' >> /usr/bin/attach-music
+    echo 'exit 0' >> /usr/bin/attach-music
     chmod +x /usr/bin/attach-music
-    ln -s /usr/bin/attach-music /usr/bin/attach-usb
-    ln -s /usr/bin/attach-music /usr/bin/attach-videos
-    ln -s /usr/bin/attach-music /usr/bin/attach-pictures
-    ln -s /usr/bin/attach-music /usr/bin/attach-media
 
     echo '#!/bin/bash' > /usr/bin/remove-music
-    echo "if [ -d $USB_MOUNT ]; then" >> /usr/bin/remove-music
-    echo "  umount $USB_MOUNT" >> /usr/bin/remove-music
-    echo "  rm -rf $USB_MOUNT" >> /usr/bin/remove-music
+    echo "if [ -d $USB_MOUNT_DLNA ]; then" >> /usr/bin/remove-music
+    echo "  umount $USB_MOUNT_DLNA" >> /usr/bin/remove-music
+    echo "  rm -rf $USB_MOUNT_DLNA" >> /usr/bin/remove-music
     echo 'fi' >> /usr/bin/remove-music
+    echo 'exit 0' >> /usr/bin/remove-music
     chmod +x /usr/bin/remove-music
-    ln -s /usr/bin/remove-music /usr/bin/detach-music
-    ln -s /usr/bin/remove-music /usr/bin/detach-usb
-    ln -s /usr/bin/remove-music /usr/bin/remove-usb
-    ln -s /usr/bin/remove-music /usr/bin/detach-media
-    ln -s /usr/bin/remove-music /usr/bin/remove-media
-    ln -s /usr/bin/remove-music /usr/bin/detach-videos
-    ln -s /usr/bin/remove-music /usr/bin/remove-videos
-    ln -s /usr/bin/remove-music /usr/bin/detach-pictures
-    ln -s /usr/bin/remove-music /usr/bin/remove-pictures
 
     mark_completed $FUNCNAME
 }

website/EN/app_dlna.html

@@ -0,0 +1,304 @@
+<?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 20:17 -->
+<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 DLNA"
+ />
+<meta name="keywords" content="freedombone, dlna" />
+<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>DLNA</h1>
+</center>
+
+<p>
+An easy way to play music on any mobile device in your home is to use the DLNA service. Copy your music into a directory called "<i>Music</i>" on an unencrypted USB thumb drive and then insert it into a USB socket on the Freedombone system.
+</p>
+
+<p>
+ssh into the system with:
+</p>
+
+<div class="org-src-container">
+<pre class="src src-bash">ssh myusername@mydomain.com -p 2222
+</pre>
+</div>
+
+<p>
+Select <b>Administrator controls</b> then <b>App Settings</b> then <b>dlna</b>. From there you can choose to attach the drive.
+</p>
+
+<p>
+The system will scan the <i>Music</i> directory, which could take a while if there are thousands of files, but you don't need to do anything further other than perhaps to log out by selecting <b>Exit</b> a couple of times.
+</p>
+
+<p>
+If you have an Android device then go to F-Droid (if you don't already have it installed then it can be <a href="https://f-droid.org/">downloaded here</a>) and search for <b>ControlDLNA</b>. On running the app you should see a red Debian icon which you can press on, then you may need to select "local". After a few seconds the list of albums or tracks should then appear and you can browse and play them.
+</p>
+
+<p>
+The DLNA service will only work within your local home network, and isn't remotely accessible from other locations via the internet. That can be both a good and a bad thing. Another consideration is that there are <i>no access controls</i> on DLNA services, so any music or videos on the USB drive will be playable by anyone within your home network.
+</p>
+</div>
+<div id="postamble" class="status">
+
+<style type="text/css">
+.back-to-top {
+    position: fixed;
+    bottom: 2em;
+    right: 0px;
+    text-decoration: none;
+    color: #000000;
+    background-color: rgba(235, 235, 235, 0.80);
+    font-size: 12px;
+    padding: 1em;
+    display: none;
+}
+
+.back-to-top:hover {
+    background-color: rgba(135, 135, 135, 0.50);
+}
+</style>
+
+<div class="back-to-top">
+<a href="#top">Back to top</a> | <a href="mailto:bob@freedombone.net">E-mail me</a>
+</div>
+</div>
+</body>
+</html>

website/EN/apps.html

@@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2016-11-12 Sat 19:06 -->
+<!-- 2016-11-12 Sat 20:19 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title></title>
@@ -257,54 +257,57 @@ The base install of the system just contains an email server and Mutt client, bu
 </div>
 </div>
 
-<div id="outline-container-org37dde03" class="outline-2">
-<h2 id="org37dde03">DLNA</h2>
-<div class="outline-text-2" id="text-org37dde03">
+<div id="outline-container-org8b362e0" class="outline-2">
+<h2 id="org8b362e0">DLNA</h2>
+<div class="outline-text-2" id="text-org8b362e0">
 <p>
 Enables you to use the system as a music server which any DLNA compatible devices can connect to within your home network.
 </p>
+
+<p>
+<a href="./app_dlna.html">How to use it</a>
+</p>
 </div>
 </div>
-
-<div id="outline-container-orgb2b081e" class="outline-2">
-<h2 id="orgb2b081e">Dokuwiki</h2>
-<div class="outline-text-2" id="text-orgb2b081e">
+<div id="outline-container-org5a75e71" class="outline-2">
+<h2 id="org5a75e71">Dokuwiki</h2>
+<div class="outline-text-2" id="text-org5a75e71">
 <p>
 A databaseless wiki system.
 </p>
 </div>
 </div>
 
-<div id="outline-container-orgbef7c5d" class="outline-2">
-<h2 id="orgbef7c5d">Emacs</h2>
-<div class="outline-text-2" id="text-orgbef7c5d">
+<div id="outline-container-org08e9b36" class="outline-2">
+<h2 id="org08e9b36">Emacs</h2>
+<div class="outline-text-2" id="text-org08e9b36">
 <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-orgea9225f" class="outline-2">
-<h2 id="orgea9225f">Etherpad</h2>
-<div class="outline-text-2" id="text-orgea9225f">
+<div id="outline-container-orgc84769a" class="outline-2">
+<h2 id="orgc84769a">Etherpad</h2>
+<div class="outline-text-2" id="text-orgc84769a">
 <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-org4b850a3" class="outline-2">
-<h2 id="org4b850a3">Ghost</h2>
-<div class="outline-text-2" id="text-org4b850a3">
+<div id="outline-container-org6fc29f0" class="outline-2">
+<h2 id="org6fc29f0">Ghost</h2>
+<div class="outline-text-2" id="text-org6fc29f0">
 <p>
 Modern looking blogging system.
 </p>
 </div>
 </div>
 
-<div id="outline-container-orgb0bbf11" class="outline-2">
-<h2 id="orgb0bbf11">GNU Social</h2>
-<div class="outline-text-2" id="text-orgb0bbf11">
+<div id="outline-container-org13473f6" class="outline-2">
+<h2 id="org13473f6">GNU Social</h2>
+<div class="outline-text-2" id="text-org13473f6">
 <p>
 Federated social network. You can "<i>remote follow</i>" other users within the GNU Social federation.
 </p>
@@ -314,27 +317,27 @@ Federated social network. You can "<i>remote follow</i>" other users within the
 </p>
 </div>
 </div>
-<div id="outline-container-org592494d" class="outline-2">
-<h2 id="org592494d">Gogs</h2>
-<div class="outline-text-2" id="text-org592494d">
+<div id="outline-container-orge704409" class="outline-2">
+<h2 id="orge704409">Gogs</h2>
+<div class="outline-text-2" id="text-orge704409">
 <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-org245ef0e" class="outline-2">
-<h2 id="org245ef0e">HTMLy</h2>
-<div class="outline-text-2" id="text-org245ef0e">
+<div id="outline-container-org615d7da" class="outline-2">
+<h2 id="org615d7da">HTMLy</h2>
+<div class="outline-text-2" id="text-org615d7da">
 <p>
 Databaseless blogging system. Quite simple and with a markdown-like format.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org3fe0bdc" class="outline-2">
-<h2 id="org3fe0bdc">Hubzilla</h2>
-<div class="outline-text-2" id="text-org3fe0bdc">
+<div id="outline-container-org11b80ad" class="outline-2">
+<h2 id="org11b80ad">Hubzilla</h2>
+<div class="outline-text-2" id="text-org11b80ad">
 <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>
@@ -344,90 +347,90 @@ Web publishing platform with social network like features and good privacy contr
 </p>
 </div>
 </div>
-<div id="outline-container-orga37f3ba" class="outline-2">
-<h2 id="orga37f3ba">IRC Server (ngirc)</h2>
-<div class="outline-text-2" id="text-orga37f3ba">
+<div id="outline-container-org3edd239" class="outline-2">
+<h2 id="org3edd239">IRC Server (ngirc)</h2>
+<div class="outline-text-2" id="text-org3edd239">
 <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>
 </div>
 </div>
 
-<div id="outline-container-org4297227" class="outline-2">
-<h2 id="org4297227">Jitsi Meet</h2>
-<div class="outline-text-2" id="text-org4297227">
+<div id="outline-container-orgbd7eda1" class="outline-2">
+<h2 id="orgbd7eda1">Jitsi Meet</h2>
+<div class="outline-text-2" id="text-orgbd7eda1">
 <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-orga757fb2" class="outline-2">
-<h2 id="orga757fb2">Lychee</h2>
-<div class="outline-text-2" id="text-orga757fb2">
+<div id="outline-container-org56f2d4c" class="outline-2">
+<h2 id="org56f2d4c">Lychee</h2>
+<div class="outline-text-2" id="text-org56f2d4c">
 <p>
 Make your photo albums available on the web.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org7a7e39b" class="outline-2">
-<h2 id="org7a7e39b">Mailpile</h2>
-<div class="outline-text-2" id="text-org7a7e39b">
+<div id="outline-container-org2c415e2" class="outline-2">
+<h2 id="org2c415e2">Mailpile</h2>
+<div class="outline-text-2" id="text-org2c415e2">
 <p>
 Modern email client which supports GPG encryption.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org857a6fa" class="outline-2">
-<h2 id="org857a6fa">Mumble</h2>
-<div class="outline-text-2" id="text-org857a6fa">
+<div id="outline-container-orgb65e532" class="outline-2">
+<h2 id="orgb65e532">Mumble</h2>
+<div class="outline-text-2" id="text-orgb65e532">
 <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-org4b60729" class="outline-2">
-<h2 id="org4b60729">PI-Hole</h2>
-<div class="outline-text-2" id="text-org4b60729">
+<div id="outline-container-org73032ef" class="outline-2">
+<h2 id="org73032ef">PI-Hole</h2>
+<div class="outline-text-2" id="text-org73032ef">
 <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-org296b9b7" class="outline-2">
-<h2 id="org296b9b7">PostActiv</h2>
-<div class="outline-text-2" id="text-org296b9b7">
+<div id="outline-container-orgac6069d" class="outline-2">
+<h2 id="orgac6069d">PostActiv</h2>
+<div class="outline-text-2" id="text-orgac6069d">
 <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-org6730c37" class="outline-2">
-<h2 id="org6730c37">Radicale</h2>
-<div class="outline-text-2" id="text-org6730c37">
+<div id="outline-container-org889b446" class="outline-2">
+<h2 id="org889b446">Radicale</h2>
+<div class="outline-text-2" id="text-org889b446">
 <p>
 Calendar system compatible with CalDAV and CardDAV. Manage your calendar events easily across all your devices.
 </p>
 </div>
 </div>
 
-<div id="outline-container-orgb6e77e0" class="outline-2">
-<h2 id="orgb6e77e0">tt-rss</h2>
-<div class="outline-text-2" id="text-orgb6e77e0">
+<div id="outline-container-orgbad0c63" class="outline-2">
+<h2 id="orgbad0c63">tt-rss</h2>
+<div class="outline-text-2" id="text-orgbad0c63">
 <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-org0e95589" class="outline-2">
-<h2 id="org0e95589">Syncthing</h2>
-<div class="outline-text-2" id="text-org0e95589">
+<div id="outline-container-org7425471" class="outline-2">
+<h2 id="org7425471">Syncthing</h2>
+<div class="outline-text-2" id="text-org7425471">
 <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>
@@ -437,27 +440,27 @@ Possibly the best way to synchronise files across all of your devices. Once it h
 </p>
 </div>
 </div>
-<div id="outline-container-org4e88617" class="outline-2">
-<h2 id="org4e88617">Tox</h2>
-<div class="outline-text-2" id="text-org4e88617">
+<div id="outline-container-org182c2c6" class="outline-2">
+<h2 id="org182c2c6">Tox</h2>
+<div class="outline-text-2" id="text-org182c2c6">
 <p>
 Client and bootstrap node for the Tox chat/VoIP system.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org888c449" class="outline-2">
-<h2 id="org888c449">Vim</h2>
-<div class="outline-text-2" id="text-org888c449">
+<div id="outline-container-org6f2a32f" class="outline-2">
+<h2 id="org6f2a32f">Vim</h2>
+<div class="outline-text-2" id="text-org6f2a32f">
 <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-org2b56b2b" class="outline-2">
-<h2 id="org2b56b2b">XMPP</h2>
-<div class="outline-text-2" id="text-org2b56b2b">
+<div id="outline-container-orga1114f1" class="outline-2">
+<h2 id="orga1114f1">XMPP</h2>
+<div class="outline-text-2" id="text-orga1114f1">
 <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/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 19:05 -->
+<!-- 2016-11-12 Sat 20:18 -->
 <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="#org141137d">Readme</a></td>
+<td class="org-left"><a href="#orge0d5123">Readme</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org9c10648">Improving ssh security</a></td>
+<td class="org-left"><a href="#orgd2a9afb">Improving ssh security</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgc3c2433">Administrating the system via an onion address (Tor)</a></td>
+<td class="org-left"><a href="#orgaf97067">Administrating the system via an onion address (Tor)</a></td>
 </tr>
 
 <tr>
@@ -279,7 +279,7 @@ for the JavaScript code in this tag.
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org5c7cafb">Play Music</a></td>
+<td class="org-left"><a href="./app_dlna.html">Play Music</a></td>
 </tr>
 
 <tr>
@@ -291,30 +291,30 @@ for the JavaScript code in this tag.
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org0aff6bf">Chat Services</a></td>
+<td class="org-left"><a href="#org61a775a">Chat Services</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgb52605f">RSS Reader</a></td>
+<td class="org-left"><a href="#orgf076640">RSS Reader</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgc9810a8">Git Projects</a></td>
+<td class="org-left"><a href="#org8b7fde8">Git Projects</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org4d7f5fe">Adding or removing users</a></td>
+<td class="org-left"><a href="#org0f48943">Adding or removing users</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgd4d5363">Blocking Ads</a></td>
+<td class="org-left"><a href="#org99fb698">Blocking Ads</a></td>
 </tr>
 </tbody>
 </table>
 
-<div id="outline-container-org141137d" class="outline-2">
-<h2 id="org141137d">Readme</h2>
-<div class="outline-text-2" id="text-org141137d">
+<div id="outline-container-orge0d5123" class="outline-2">
+<h2 id="orge0d5123">Readme</h2>
+<div class="outline-text-2" id="text-orge0d5123">
 <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>
@@ -334,9 +334,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-org9c10648" class="outline-2">
-<h2 id="org9c10648">Improving ssh security</h2>
-<div class="outline-text-2" id="text-org9c10648">
+<div id="outline-container-orgd2a9afb" class="outline-2">
+<h2 id="orgd2a9afb">Improving ssh security</h2>
+<div class="outline-text-2" id="text-orgd2a9afb">
 <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>
@@ -386,9 +386,9 @@ If you wish to only use ssh keys then log in to the Freedombone, become the root
 </div>
 </div>
 
-<div id="outline-container-orgc3c2433" class="outline-2">
-<h2 id="orgc3c2433">Administrating the system via an onion address (Tor)</h2>
-<div class="outline-text-2" id="text-orgc3c2433">
+<div id="outline-container-orgaf97067" class="outline-2">
+<h2 id="orgaf97067">Administrating the system via an onion address (Tor)</h2>
+<div class="outline-text-2" id="text-orgaf97067">
 <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>
@@ -430,63 +430,19 @@ Subsequently even if dynamic DNS isn't working you may still be able to administ
 </p>
 </div>
 </div>
-<div id="outline-container-org5c7cafb" class="outline-2">
-<h2 id="org5c7cafb">Play Music</h2>
-<div class="outline-text-2" id="text-org5c7cafb">
-</div><div id="outline-container-org8f0f04b" class="outline-3">
-<h3 id="org8f0f04b">With the DLNA service</h3>
-<div class="outline-text-3" id="text-org8f0f04b">
-<p>
-An easy way to play music on any mobile device in your home is to use the DLNA service. Copy your music into a directory called "<i>Music</i>" on a USB thumb drive and then insert it into from socket on the Beaglebone.
-</p>
-
-<p>
-ssh into the system with:
-</p>
-
-<div class="org-src-container">
-<pre class="src src-bash">ssh myusername@mydomain.com -p 2222
-</pre>
-</div>
-
-<p>
-Then mount the USB drive with:
-</p>
-
-<div class="org-src-container">
-<pre class="src src-bash">su
-attach-music
-</pre>
-</div>
-
-<p>
-The system will scan the Music directory, which could take a while if there are thousands of files, but you don't need to do anything further with the Beaglebone other than perhaps to log out by typing <b>exit</b> a couple of times.
-</p>
-
-<p>
-If you have an Android device then go to F-Droid (if you don't already have it installed then it can be <a href="https://f-droid.org/">downloaded here</a>) and search for <b>ControlDLNA</b>. On running the app you should see a red Debian icon which you can press on, then you may need to select "local". After a few seconds the list of albums or tracks should then appear and you can browse and play them.
-</p>
-
-<p>
-The DLNA service will only work within your local home network, and isn't remotely accessible from other locations via the internet. That can be both a good and a bad thing. Another consideration is that there are no access controls on DLNA services, so any music or videos on the USB drive will be playable by anyone within your home network.
-</p>
-</div>
-</div>
-</div>
-
-<div id="outline-container-org0aff6bf" class="outline-2">
-<h2 id="org0aff6bf">Chat Services</h2>
-<div class="outline-text-2" id="text-org0aff6bf">
-</div><div id="outline-container-org09c4a1e" class="outline-3">
-<h3 id="org09c4a1e">IRC</h3>
-<div class="outline-text-3" id="text-org09c4a1e">
+<div id="outline-container-org61a775a" class="outline-2">
+<h2 id="org61a775a">Chat Services</h2>
+<div class="outline-text-2" id="text-org61a775a">
+</div><div id="outline-container-orgf4bf4ce" class="outline-3">
+<h3 id="orgf4bf4ce">IRC</h3>
+<div class="outline-text-3" id="text-orgf4bf4ce">
 <p>
 IRC is useful for multi-user chat. The classic use case is for software development where many engineers might need to coordinate their activities, but it's also useful for meetings, parties and general socialising.
 </p>
 </div>
-<div id="outline-container-org6aa72bd" class="outline-4">
-<h4 id="org6aa72bd">Irssi</h4>
-<div class="outline-text-4" id="text-org6aa72bd">
+<div id="outline-container-orgacaf59f" class="outline-4">
+<h4 id="orgacaf59f">Irssi</h4>
+<div class="outline-text-4" id="text-orgacaf59f">
 <p>
 The easiest way to use irssi is to connect to your system, like this:
 </p>
@@ -501,9 +457,9 @@ Then select <b>IRC</b> from the menu. However, other than via this method using
 </p>
 </div>
 </div>
-<div id="outline-container-org42430e0" class="outline-4">
-<h4 id="org42430e0">HexChat</h4>
-<div class="outline-text-4" id="text-org42430e0">
+<div id="outline-container-org4acdb42" class="outline-4">
+<h4 id="org4acdb42">HexChat</h4>
+<div class="outline-text-4" id="text-org4acdb42">
 <p>
 HexChat (formerly XChat) is compatible with proxying via Tor and so provides the best security when connecting to your IRC server. It will allow you to connect to your IRC server's onion address.
 </p>
@@ -584,9 +540,9 @@ Click <b>close</b> and then <b>connect</b>.
 </div>
 </div>
 
-<div id="outline-container-org11890a4" class="outline-4">
-<h4 id="org11890a4">Emacs</h4>
-<div class="outline-text-4" id="text-org11890a4">
+<div id="outline-container-orgcb3ad1c" class="outline-4">
+<h4 id="orgcb3ad1c">Emacs</h4>
+<div class="outline-text-4" id="text-orgcb3ad1c">
 <p>
 If you are an Emacs user then you can also connect to your IRC server via Emacs.
 </p>
@@ -617,9 +573,9 @@ Add the following to your Emacs configuration file:
 </div>
 </div>
 </div>
-<div id="outline-container-orgd474965" class="outline-4">
-<h4 id="orgd474965">Changing or removing the IRC password</h4>
-<div class="outline-text-4" id="text-orgd474965">
+<div id="outline-container-orgaec0a45" class="outline-4">
+<h4 id="orgaec0a45">Changing or removing the IRC password</h4>
+<div class="outline-text-4" id="text-orgaec0a45">
 <p>
 By default the IRC server is set up to require a password for users to log in. The password is the same for all users. If you want to change or remove the password:
 </p>
@@ -636,20 +592,20 @@ Select <i>Administrator controls</i> then <b>IRC Menu</b> and then change the pa
 </div>
 </div>
 
-<div id="outline-container-orgfc8f38b" class="outline-3">
-<h3 id="orgfc8f38b">XMPP/Jabber</h3>
-<div class="outline-text-3" id="text-orgfc8f38b">
-</div><div id="outline-container-org8b413e8" class="outline-4">
-<h4 id="org8b413e8">About XMPP</h4>
-<div class="outline-text-4" id="text-org8b413e8">
+<div id="outline-container-org4016ecb" class="outline-3">
+<h3 id="org4016ecb">XMPP/Jabber</h3>
+<div class="outline-text-3" id="text-org4016ecb">
+</div><div id="outline-container-org4c7f956" class="outline-4">
+<h4 id="org4c7f956">About XMPP</h4>
+<div class="outline-text-4" id="text-org4c7f956">
 <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-org34fc80f" class="outline-4">
-<h4 id="org34fc80f">Using with Gajim</h4>
-<div class="outline-text-4" id="text-org34fc80f">
+<div id="outline-container-org706b122" class="outline-4">
+<h4 id="org706b122">Using with Gajim</h4>
+<div class="outline-text-4" id="text-org706b122">
 <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>
@@ -693,9 +649,9 @@ If you wish to use OpenPGP to encrypt your messages then go to <b>Edit/Accounts<
 </div>
 </div>
 
-<div id="outline-container-org2e3a3ad" class="outline-4">
-<h4 id="org2e3a3ad">Using with Profanity</h4>
-<div class="outline-text-4" id="text-org2e3a3ad">
+<div id="outline-container-org27d6954" class="outline-4">
+<h4 id="org27d6954">Using with Profanity</h4>
+<div class="outline-text-4" id="text-org27d6954">
 <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>
@@ -777,9 +733,9 @@ When accessed via the user control panel the client is automatically routed thro
 </p>
 </div>
 </div>
-<div id="outline-container-orgcce7e0d" class="outline-4">
-<h4 id="orgcce7e0d">Using with Jitsi</h4>
-<div class="outline-text-4" id="text-orgcce7e0d">
+<div id="outline-container-org3a05a57" class="outline-4">
+<h4 id="org3a05a57">Using with Jitsi</h4>
+<div class="outline-text-4" id="text-org3a05a57">
 <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>
@@ -809,9 +765,9 @@ You can also <a href="https://www.youtube.com/watch?v=vgx7VSrDGjk">see this vide
 </p>
 </div>
 </div>
-<div id="outline-container-orgcd30180" class="outline-4">
-<h4 id="orgcd30180">Using with Ubuntu</h4>
-<div class="outline-text-4" id="text-orgcd30180">
+<div id="outline-container-org77d30ac" class="outline-4">
+<h4 id="org77d30ac">Using with Ubuntu</h4>
+<div class="outline-text-4" id="text-org77d30ac">
 <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>
@@ -829,17 +785,17 @@ Click on <b>Advanced</b> and make sure that <b>Encryption required</b> and <b>Ig
 </p>
 </div>
 </div>
-<div id="outline-container-org531c10e" class="outline-4">
-<h4 id="org531c10e">Using Tor Messenger</h4>
-<div class="outline-text-4" id="text-org531c10e">
+<div id="outline-container-orgeba2ba7" class="outline-4">
+<h4 id="orgeba2ba7">Using Tor Messenger</h4>
+<div class="outline-text-4" id="text-orgeba2ba7">
 <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-org4f51b2a" class="outline-4">
-<h4 id="org4f51b2a">Using with Android/Conversations</h4>
-<div class="outline-text-4" id="text-org4f51b2a">
+<div id="outline-container-orgab2ba25" class="outline-4">
+<h4 id="orgab2ba25">Using with Android/Conversations</h4>
+<div class="outline-text-4" id="text-orgab2ba25">
 <p>
 Install <a href="https://f-droid.org/">F-Droid</a>
 </p>
@@ -874,16 +830,16 @@ Then select <b>Next</b>. When chatting you can use the lock icon to encrypt your
 </div>
 </div>
 </div>
-<div id="outline-container-orga8ba519" class="outline-3">
-<h3 id="orga8ba519">Tox</h3>
-<div class="outline-text-3" id="text-orga8ba519">
+<div id="outline-container-org4f4b967" class="outline-3">
+<h3 id="org4f4b967">Tox</h3>
+<div class="outline-text-3" id="text-org4f4b967">
 <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-orgc740041" class="outline-4">
-<h4 id="orgc740041">Using the Toxic client</h4>
-<div class="outline-text-4" id="text-orgc740041">
+<div id="outline-container-org1b76e54" class="outline-4">
+<h4 id="org1b76e54">Using the Toxic client</h4>
+<div class="outline-text-4" id="text-org1b76e54">
 <p>
 Log into your system with:
 </p>
@@ -906,20 +862,20 @@ Then from the menu select <b>Tox Chat</b>. Tox is encrypted by default and also
 </div>
 </div>
 
-<div id="outline-container-orgc288724" class="outline-3">
-<h3 id="orgc288724">VoIP (Voice and text chat)</h3>
-<div class="outline-text-3" id="text-orgc288724">
-</div><div id="outline-container-org314f074" class="outline-4">
-<h4 id="org314f074">Text chat</h4>
-<div class="outline-text-4" id="text-org314f074">
+<div id="outline-container-org39c5c24" class="outline-3">
+<h3 id="org39c5c24">VoIP (Voice and text chat)</h3>
+<div class="outline-text-3" id="text-org39c5c24">
+</div><div id="outline-container-org29bf1bd" class="outline-4">
+<h4 id="org29bf1bd">Text chat</h4>
+<div class="outline-text-4" id="text-org29bf1bd">
 <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-org356d6d8" class="outline-4">
-<h4 id="org356d6d8">Using with Ubuntu</h4>
-<div class="outline-text-4" id="text-org356d6d8">
+<div id="outline-container-orgdeb8d3a" class="outline-4">
+<h4 id="orgdeb8d3a">Using with Ubuntu</h4>
+<div class="outline-text-4" id="text-orgdeb8d3a">
 <p>
 Within the software center search for "mumble" and install the client then run it. Skip through the audio setup wizard.
 </p>
@@ -929,9 +885,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-orgbe64210" class="outline-4">
-<h4 id="orgbe64210">Using with Android</h4>
-<div class="outline-text-4" id="text-orgbe64210">
+<div id="outline-container-org1fc921a" class="outline-4">
+<h4 id="org1fc921a">Using with Android</h4>
+<div class="outline-text-4" id="text-org1fc921a">
 <p>
 Install <a href="https://f-droid.org/">F-Droid</a>
 </p>
@@ -966,24 +922,24 @@ Selecting the server by pressing on it then connects you to the server so that y
 </div>
 </div>
 </div>
-<div id="outline-container-org390ba27" class="outline-3">
-<h3 id="org390ba27">SIP phones</h3>
-<div class="outline-text-3" id="text-org390ba27">
+<div id="outline-container-org678aa32" class="outline-3">
+<h3 id="org678aa32">SIP phones</h3>
+<div class="outline-text-3" id="text-org678aa32">
 <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-orge2d32ba" class="outline-4">
-<h4 id="orge2d32ba">About ZRTP</h4>
-<div class="outline-text-4" id="text-orge2d32ba">
+<div id="outline-container-org74168da" class="outline-4">
+<h4 id="org74168da">About ZRTP</h4>
+<div class="outline-text-4" id="text-org74168da">
 <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-org66fe13a" class="outline-4">
-<h4 id="org66fe13a">Using with CSIPSimple</h4>
-<div class="outline-text-4" id="text-org66fe13a">
+<div id="outline-container-org5a51525" class="outline-4">
+<h4 id="org5a51525">Using with CSIPSimple</h4>
+<div class="outline-text-4" id="text-org5a51525">
 <p>
 Add an account. Under <b>General Wizards</b> choose <b>Expert</b> and enter the following details:
 </p>
@@ -1039,9 +995,9 @@ If everything is working the account should appear in green with a status of <b>
 </p>
 </div>
 </div>
-<div id="outline-container-orgbdd9823" class="outline-4">
-<h4 id="orgbdd9823">Using with Ring</h4>
-<div class="outline-text-4" id="text-orgbdd9823">
+<div id="outline-container-org3a1fff5" class="outline-4">
+<h4 id="org3a1fff5">Using with Ring</h4>
+<div class="outline-text-4" id="text-org3a1fff5">
 <p>
 From the menu select <b>Manage accounts</b>.
 </p>
@@ -1094,9 +1050,9 @@ Select the <b>Security</b> tab. Under <b>SRTP Key Exchange</b> select <b>ZRTP</b
 </div>
 </div>
 
-<div id="outline-container-orgb52605f" class="outline-2">
-<h2 id="orgb52605f">RSS Reader</h2>
-<div class="outline-text-2" id="text-orgb52605f">
+<div id="outline-container-orgf076640" class="outline-2">
+<h2 id="orgf076640">RSS Reader</h2>
+<div class="outline-text-2" id="text-orgf076640">
 <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>
@@ -1108,9 +1064,9 @@ The way that RSS reading is set up on Freedombone gives you strong reading priva
 </div>
 </div>
 
-<div id="outline-container-orgdac978f" class="outline-3">
-<h3 id="orgdac978f">Finding the onion address</h3>
-<div class="outline-text-3" id="text-orgdac978f">
+<div id="outline-container-orgc718f45" class="outline-3">
+<h3 id="orgc718f45">Finding the onion address</h3>
+<div class="outline-text-3" id="text-orgc718f45">
 <p>
 See the control panel for the RSS reader onion address.
 </p>
@@ -1134,9 +1090,9 @@ To set up the system open <a href="http://rss_reader_onion_address">http://rss_r
 </div>
 </div>
 
-<div id="outline-container-org83b86ad" class="outline-3">
-<h3 id="org83b86ad">On mobile</h3>
-<div class="outline-text-3" id="text-org83b86ad">
+<div id="outline-container-orgfebdb13" class="outline-3">
+<h3 id="orgfebdb13">On mobile</h3>
+<div class="outline-text-3" id="text-orgfebdb13">
 <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>
@@ -1148,9 +1104,9 @@ A note for the paranoid is that on mobile devices you get redirected to a differ
 </blockquote>
 </div>
 </div>
-<div id="outline-container-org1d77402" class="outline-3">
-<h3 id="org1d77402">With Emacs</h3>
-<div class="outline-text-3" id="text-org1d77402">
+<div id="outline-container-orgac64c2b" class="outline-3">
+<h3 id="orgac64c2b">With Emacs</h3>
+<div class="outline-text-3" id="text-orgac64c2b">
 <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>
@@ -1189,9 +1145,9 @@ And ensure that the Tor daemon is installed:
 </div>
 </div>
 </div>
-<div id="outline-container-orgc9810a8" class="outline-2">
-<h2 id="orgc9810a8">Git Projects</h2>
-<div class="outline-text-2" id="text-orgc9810a8">
+<div id="outline-container-org8b7fde8" class="outline-2">
+<h2 id="org8b7fde8">Git Projects</h2>
+<div class="outline-text-2" id="text-org8b7fde8">
 <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>
@@ -1227,9 +1183,9 @@ This will stop any spam accounts being created by random strangers or bots. You
 </p>
 </div>
 </div>
-<div id="outline-container-org4d7f5fe" class="outline-2">
-<h2 id="org4d7f5fe">Adding or removing users</h2>
-<div class="outline-text-2" id="text-org4d7f5fe">
+<div id="outline-container-org0f48943" class="outline-2">
+<h2 id="org0f48943">Adding or removing users</h2>
+<div class="outline-text-2" id="text-org0f48943">
 <p>
 Log into the system with:
 </p>
@@ -1257,9 +1213,9 @@ control
 </div>
 </div>
 
-<div id="outline-container-orgd4d5363" class="outline-2">
-<h2 id="orgd4d5363">Blocking Ads</h2>
-<div class="outline-text-2" id="text-orgd4d5363">
+<div id="outline-container-org99fb698" class="outline-2">
+<h2 id="org99fb698">Blocking Ads</h2>
+<div class="outline-text-2" id="text-org99fb698">
 <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>
@@ -1273,9 +1229,9 @@ Also don't expect perfection. Though many ads may be blocked by this system some
 </p>
 </div>
 
-<div id="outline-container-org6790473" class="outline-3">
-<h3 id="org6790473">Set a static IP address</h3>
-<div class="outline-text-3" id="text-org6790473">
+<div id="outline-container-org36b0a42" class="outline-3">
+<h3 id="org36b0a42">Set a static IP address</h3>
+<div class="outline-text-3" id="text-org36b0a42">
 <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>
@@ -1286,9 +1242,9 @@ When that's done select <b>About this system</b> from the control panel and see
 </div>
 </div>
 
-<div id="outline-container-org4ec35fd" class="outline-3">
-<h3 id="org4ec35fd">On each client system within your local network</h3>
-<div class="outline-text-3" id="text-org4ec35fd">
+<div id="outline-container-orgf4ac5e0" class="outline-3">
+<h3 id="orgf4ac5e0">On each client system within your local network</h3>
+<div class="outline-text-3" id="text-orgf4ac5e0">
 <div class="org-src-container">
 <pre class="src src-bash">sudo chattr -i /etc/resolv.conf
 sudo nano /etc/resolv.conf
@@ -1315,9 +1271,9 @@ Normally <i>resolv.conf</i> will be overwritten every time your reboot, but you
 </div>
 </div>
 
-<div id="outline-container-orgbb72fde" class="outline-3">
-<h3 id="orgbb72fde">On your internet router</h3>
-<div class="outline-text-3" id="text-orgbb72fde">
+<div id="outline-container-org9063cc0" class="outline-3">
+<h3 id="org9063cc0">On your internet router</h3>
+<div class="outline-text-3" id="text-org9063cc0">
 <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>
@@ -1327,9 +1283,9 @@ Edit the DNS settings and add the IPv4 address which you got from the control pa
 </p>
 </div>
 
-<div id="outline-container-org655f73f" class="outline-4">
-<h4 id="org655f73f">LibreCMC</h4>
-<div class="outline-text-4" id="text-org655f73f">
+<div id="outline-container-org1b0b157" class="outline-4">
+<h4 id="org1b0b157">LibreCMC</h4>
+<div class="outline-text-4" id="text-org1b0b157">
 <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>
@@ -1337,9 +1293,9 @@ On a router running LibreCMC from the <b>Network</b> menu select <b>DHCP and DNS
 </div>
 </div>
 
-<div id="outline-container-org29026cb" class="outline-3">
-<h3 id="org29026cb">Configuring block lists</h3>
-<div class="outline-text-3" id="text-org29026cb">
+<div id="outline-container-org116997a" class="outline-3">
+<h3 id="org116997a">Configuring block lists</h3>
+<div class="outline-text-3" id="text-org116997a">
 <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>