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

doc/EN/app_fedwiki.org

+#+TITLE:
+#+AUTHOR: Bob Mottram
+#+EMAIL: bob@freedombone.net
+#+KEYWORDS: freedombone, fedwiki
+#+DESCRIPTION: How to use Federated Wiki
+#+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>Federated Wiki</h1>
+</center>
+#+END_EXPORT
+
+Federated wikis are a relatively new concept. There can be multiple copies of the same page on different servers and it's then easy to pick which version you prefer, or make something new. It's like wiki meets mashup meets federation, and so is different from many previous web paradigms and may take some recalibration of how you think the web should work.
+
+* Installation
+Log into your system with:
+
+#+begin_src bash
+ssh myusername@mydomain -p 2222
+#+end_src
+
+Using cursor keys, space bar and Enter key select *Administrator controls* and type in your password.
+
+Select *Add/Remove Apps* then *fedwiki*. You will then be asked for a domain name and if you are using FreeDNS also the code for the domain which can be found under *Dynamic DNS* on the FreeDNS site (the random string from "/quick cron example/" which appears after /update.php?/ and before />>/). For more details on obtaining a domain and making it accessible via dynamic DNS see the [[./faq.html][FAQ]]. Typically the domain name you use will be a subdomain, such as /wiki.mydomainname.net/. It will need to be a domain which you have bought somewhere and own and not one of the FreeDNS subdomains, otherwise you won't be able to get a SSL/TLS certificate for it.
+
+
+* Usage
+First you'll need to get the login password, which can be found on the *Administrator control panel* under *Passwords* then *fedwiki*.
+
+Navigate to your wiki site then click on the *lock icon* at the bottom of the screen and enter the password. It should then appear unlocked. If you don't unlock then any edits you make won't be saved.
+
+There are a few things to know about using the federated wiki.
+
+ * You can edit by clicking on the *wiki* button at the bottom of the screen
+ * To edit a paragraph double click on it
+ * To remove a paragraph just delete all of its text
+ * Paragraphs can be dragged up and down to change their order, or moved between pages
+ * To add a new paragraph use the *+* button
+ * You can use left and right cursor keys to move through pages
+ * To claim/fork a page from another server click on the flag icon
+ * When done editing click on the *wiki* button again
+ * Different versions of the same page on different servers are represented by boxes at the bottom right of the screen. You can double click on them to see the different versions, and use the flag icon to fork if you prefer that version

doc/EN/apps.org

 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.
 
 [[./app_etherpad.html][How to use it]]
+* Federated wiki
+A new approach to creating wiki content.
+
+[[./app_fedwiki.html][How to use it]]
 * Friendica
 Federated social network system.
 

src/freedombone-app-fedwiki

                    MY_EMAIL_ADDRESS)
 
 function fedwiki_remove_bad_links {
-    if [ -f /usr/local/lib/node_modules/wiki/node_modules/wiki-security-friends/client/security.js ]; then
-        sed -i 's|maxcdn.bootstrapcdn.com|localhost|g' /usr/local/lib/node_modules/wiki/node_modules/wiki-security-friends/client/security.js
+    if [[ $ONION_ONLY == 'no' ]]; then
+        sed -i "s|link[href='https://maxcdn.bootstrapcdn.com.*|link[href='https://${FEDWIKI_DOMAIN_NAME}/fonts-font-awesome/css/font-awesome.min.css']\").length) {|g" /usr/local/lib/node_modules/wiki/node_modules/wiki-security-friends/client/security.js
+
+        sed -i "s|\$('<link rel=\"stylesheet\" href=\"https://maxcdn.bootstrapcdn.com.*|\$('<link rel=\"stylesheet\" href=\"https://${FEDWIKI_DOMAIN_NAME}/fonts-font-awesome/css/font-awesome.min.css\">').appendTo(\"head\");|g" /usr/local/lib/node_modules/wiki/node_modules/wiki-security-friends/client/security.js
+    else
+        FEDWIKI_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_fedwiki/hostname)
+        sed -i "s|link[href='https://maxcdn.bootstrapcdn.com.*|link[href='http://${FEDWIKI_ONION_HOSTNAME}/fonts-font-awesome/css/font-awesome.min.css']\").length) {|g" /usr/local/lib/node_modules/wiki/node_modules/wiki-security-friends/client/security.js
+
+        sed -i "s|\$('<link rel=\"stylesheet\" href=\"https://maxcdn.bootstrapcdn.com.*|\$('<link rel=\"stylesheet\" href=\"http://${FEDWIKI_ONION_HOSTNAME}/fonts-font-awesome/css/font-awesome.min.css\">').appendTo(\"head\");|g" /usr/local/lib/node_modules/wiki/node_modules/wiki-security-friends/client/security.js
     fi
 
     if [ -f /usr/local/lib/node_modules/wiki/node_modules/localforage/docs/theme/style.css ]; then
     fi
     ${PROJECT_NAME}-pass -u $FEDWIKI_USERNAME -a fedwiki -p "$FEDWIKI_PASSWORD"
     sed -i "s|--cookieSecret .*|--cookieSecret '${FEDWIKI_PASSWORD}'|g" /etc/systemd/system/fedwiki.service
+    sed -i "s|\"secret\":.*|\"secret\": \"${FEDWIKI_PASSWORD}\"|g" ${FEDWIKI_DATA}/status/owner.json
     systemctl daemon-reload
     systemctl restart fedwiki
     write_config_param "FEDWIKI_COOKIE" "$FEDWIKI_PASSWORD"
             rm -rf $temp_restore_dir
         fi
 
+        FEDWIKI_PASSWORD=$(cat ${FEDWIKI_DATA}/status/owner.json | grep secret | awk -F '"' '{print $4}')
+        ${PROJECT_NAME}-pass -u $FEDWIKI_USERNAME -a fedwiki -p "$FEDWIKI_PASSWORD"
+        sed -i "s|--cookieSecret .*|--cookieSecret '${FEDWIKI_PASSWORD}'|g" /etc/systemd/system/fedwiki.service
+        write_config_param "FEDWIKI_COOKIE" "$FEDWIKI_PASSWORD"
+        systemctl daemon-reload
         systemctl start fedwiki
         restart_site
     fi
         rm -rf $temp_restore_dir
     fi
 
+    FEDWIKI_PASSWORD=$(cat ${FEDWIKI_DATA}/status/owner.json | grep secret | awk -F '"' '{print $4}')
+    ${PROJECT_NAME}-pass -u $FEDWIKI_USERNAME -a fedwiki -p "$FEDWIKI_PASSWORD"
+    sed -i "s|--cookieSecret .*|--cookieSecret '${FEDWIKI_PASSWORD}'|g" /etc/systemd/system/fedwiki.service
+    write_config_param "FEDWIKI_COOKIE" "$FEDWIKI_PASSWORD"
+    systemctl daemon-reload
     systemctl start fedwiki
     restart_site
 }
         echo '  add_header X-Content-Type-Options nosniff;' >> $fedwiki_nginx_file
         echo '  add_header Strict-Transport-Security max-age=15768000;' >> $fedwiki_nginx_file
         echo '' >> $fedwiki_nginx_file
+        echo '  location /fonts-font-awesome/ {' >> $fedwiki_nginx_file
+        echo '    alias /usr/share/fonts-font-awesome/;' >> $fedwiki_nginx_file
+        echo '  }' >> $fedwiki_nginx_file
+        echo '' >> $fedwiki_nginx_file
         echo '  location / {' >> $fedwiki_nginx_file
         echo "    proxy_pass http://localhost:${FEDWIKI_PORT};" >> $fedwiki_nginx_file
         echo '    proxy_set_header X-Real-IP $remote_addr;' >> $fedwiki_nginx_file
     echo '  add_header X-Frame-Options DENY;' >> $fedwiki_nginx_file
     echo '  add_header X-Content-Type-Options nosniff;' >> $fedwiki_nginx_file
     echo '' >> $fedwiki_nginx_file
+    echo '  location /fonts-font-awesome/ {' >> $fedwiki_nginx_file
+    echo '    alias /usr/share/fonts-font-awesome/;' >> $fedwiki_nginx_file
+    echo '  }' >> $fedwiki_nginx_file
+    echo '' >> $fedwiki_nginx_file
     echo '  location / {' >> $fedwiki_nginx_file
     echo "    proxy_pass http://localhost:${FEDWIKI_PORT};" >> $fedwiki_nginx_file
     echo '    proxy_set_header X-Real-IP $remote_addr;' >> $fedwiki_nginx_file
     function_check install_nodejs
     install_nodejs fedwiki
 
+    apt-get -yq install fonts-font-awesome
+
     npm install -g wiki@$FEDWIKI_VERSION
     if [ ! "$?" = "0" ]; then
         echo $'Failed to install fedwiki'
     FEDWIKI_ONION_HOSTNAME=$(add_onion_service fedwiki 80 ${FEDWIKI_ONION_PORT})
 
     if [ ! $FEDWIKI_COOKIE ]; then
-        FEDWIKI_COOKIE="$(create_password 30)"
+        FEDWIKI_COOKIE="$(create_password 20)"
     fi
 
     echo '[Unit]' > /etc/systemd/system/fedwiki.service

website/EN/app_fedwiki.html

+<?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>
+<!-- 2018-01-05 Fri 21:22 -->
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<title>&lrm;</title>
+<meta name="generator" content="Org mode" />
+<meta name="author" content="Bob Mottram" />
+<meta name="description" content="How to use Federated Wiki"
+ />
+<meta name="keywords" content="freedombone, fedwiki" />
+<style type="text/css">
+ <!--/*--><![CDATA[/*><!--*/
+  .title  { text-align: center;
+             margin-bottom: .2em; }
+  .subtitle { text-align: center;
+              font-size: medium;
+              font-weight: bold;
+              margin-top:0; }
+  .todo   { font-family: monospace; color: red; }
+  .done   { font-family: monospace; color: green; }
+  .priority { font-family: monospace; color: orange; }
+  .tag    { background-color: #eee; font-family: monospace;
+            padding: 2px; font-size: 80%; font-weight: normal; }
+  .timestamp { color: #bebebe; }
+  .timestamp-kwd { color: #5f9ea0; }
+  .org-right  { margin-left: auto; margin-right: 0px;  text-align: right; }
+  .org-left   { margin-left: 0px;  margin-right: auto; text-align: left; }
+  .org-center { margin-left: auto; margin-right: auto; text-align: center; }
+  .underline { text-decoration: underline; }
+  #postamble p, #preamble p { font-size: 90%; margin: .2em; }
+  p.verse { margin-left: 3%; }
+  pre {
+    border: 1px solid #ccc;
+    box-shadow: 3px 3px 3px #eee;
+    padding: 8pt;
+    font-family: monospace;
+    overflow: auto;
+    margin: 1.2em;
+  }
+  pre.src {
+    position: relative;
+    overflow: visible;
+    padding-top: 1.2em;
+  }
+  pre.src:before {
+    display: none;
+    position: absolute;
+    background-color: white;
+    top: -10px;
+    right: 10px;
+    padding: 3px;
+    border: 1px solid black;
+  }
+  pre.src:hover:before { display: inline;}
+  /* Languages per Org manual */
+  pre.src-asymptote:before { content: 'Asymptote'; }
+  pre.src-awk:before { content: 'Awk'; }
+  pre.src-C:before { content: 'C'; }
+  /* pre.src-C++ doesn't work in CSS */
+  pre.src-clojure:before { content: 'Clojure'; }
+  pre.src-css:before { content: 'CSS'; }
+  pre.src-D:before { content: 'D'; }
+  pre.src-ditaa:before { content: 'ditaa'; }
+  pre.src-dot:before { content: 'Graphviz'; }
+  pre.src-calc:before { content: 'Emacs Calc'; }
+  pre.src-emacs-lisp:before { content: 'Emacs Lisp'; }
+  pre.src-fortran:before { content: 'Fortran'; }
+  pre.src-gnuplot:before { content: 'gnuplot'; }
+  pre.src-haskell:before { content: 'Haskell'; }
+  pre.src-hledger:before { content: 'hledger'; }
+  pre.src-java:before { content: 'Java'; }
+  pre.src-js:before { content: 'Javascript'; }
+  pre.src-latex:before { content: 'LaTeX'; }
+  pre.src-ledger:before { content: 'Ledger'; }
+  pre.src-lisp:before { content: 'Lisp'; }
+  pre.src-lilypond:before { content: 'Lilypond'; }
+  pre.src-lua:before { content: 'Lua'; }
+  pre.src-matlab:before { content: 'MATLAB'; }
+  pre.src-mscgen:before { content: 'Mscgen'; }
+  pre.src-ocaml:before { content: 'Objective Caml'; }
+  pre.src-octave:before { content: 'Octave'; }
+  pre.src-org:before { content: 'Org mode'; }
+  pre.src-oz:before { content: 'OZ'; }
+  pre.src-plantuml:before { content: 'Plantuml'; }
+  pre.src-processing:before { content: 'Processing.js'; }
+  pre.src-python:before { content: 'Python'; }
+  pre.src-R:before { content: 'R'; }
+  pre.src-ruby:before { content: 'Ruby'; }
+  pre.src-sass:before { content: 'Sass'; }
+  pre.src-scheme:before { content: 'Scheme'; }
+  pre.src-screen:before { content: 'Gnu Screen'; }
+  pre.src-sed:before { content: 'Sed'; }
+  pre.src-sh:before { content: 'shell'; }
+  pre.src-sql:before { content: 'SQL'; }
+  pre.src-sqlite:before { content: 'SQLite'; }
+  /* additional languages in org.el's org-babel-load-languages alist */
+  pre.src-forth:before { content: 'Forth'; }
+  pre.src-io:before { content: 'IO'; }
+  pre.src-J:before { content: 'J'; }
+  pre.src-makefile:before { content: 'Makefile'; }
+  pre.src-maxima:before { content: 'Maxima'; }
+  pre.src-perl:before { content: 'Perl'; }
+  pre.src-picolisp:before { content: 'Pico Lisp'; }
+  pre.src-scala:before { content: 'Scala'; }
+  pre.src-shell:before { content: 'Shell Script'; }
+  pre.src-ebnf2ps:before { content: 'ebfn2ps'; }
+  /* additional language identifiers per "defun org-babel-execute"
+       in ob-*.el */
+  pre.src-cpp:before  { content: 'C++'; }
+  pre.src-abc:before  { content: 'ABC'; }
+  pre.src-coq:before  { content: 'Coq'; }
+  pre.src-groovy:before  { content: 'Groovy'; }
+  /* additional language identifiers from org-babel-shell-names in
+     ob-shell.el: ob-shell is the only babel language using a lambda to put
+     the execution function name together. */
+  pre.src-bash:before  { content: 'bash'; }
+  pre.src-csh:before  { content: 'csh'; }
+  pre.src-ash:before  { content: 'ash'; }
+  pre.src-dash:before  { content: 'dash'; }
+  pre.src-ksh:before  { content: 'ksh'; }
+  pre.src-mksh:before  { content: 'mksh'; }
+  pre.src-posh:before  { content: 'posh'; }
+  /* Additional Emacs modes also supported by the LaTeX listings package */
+  pre.src-ada:before { content: 'Ada'; }
+  pre.src-asm:before { content: 'Assembler'; }
+  pre.src-caml:before { content: 'Caml'; }
+  pre.src-delphi:before { content: 'Delphi'; }
+  pre.src-html:before { content: 'HTML'; }
+  pre.src-idl:before { content: 'IDL'; }
+  pre.src-mercury:before { content: 'Mercury'; }
+  pre.src-metapost:before { content: 'MetaPost'; }
+  pre.src-modula-2:before { content: 'Modula-2'; }
+  pre.src-pascal:before { content: 'Pascal'; }
+  pre.src-ps:before { content: 'PostScript'; }
+  pre.src-prolog:before { content: 'Prolog'; }
+  pre.src-simula:before { content: 'Simula'; }
+  pre.src-tcl:before { content: 'tcl'; }
+  pre.src-tex:before { content: 'TeX'; }
+  pre.src-plain-tex:before { content: 'Plain TeX'; }
+  pre.src-verilog:before { content: 'Verilog'; }
+  pre.src-vhdl:before { content: 'VHDL'; }
+  pre.src-xml:before { content: 'XML'; }
+  pre.src-nxml:before { content: 'XML'; }
+  /* add a generic configuration mode; LaTeX export needs an additional
+     (add-to-list 'org-latex-listings-langs '(conf " ")) in .emacs */
+  pre.src-conf:before { content: 'Configuration File'; }
+
+  table { border-collapse:collapse; }
+  caption.t-above { caption-side: top; }
+  caption.t-bottom { caption-side: bottom; }
+  td, th { vertical-align:top;  }
+  th.org-right  { text-align: center;  }
+  th.org-left   { text-align: center;   }
+  th.org-center { text-align: center; }
+  td.org-right  { text-align: right;  }
+  td.org-left   { text-align: left;   }
+  td.org-center { text-align: center; }
+  dt { font-weight: bold; }
+  .footpara { display: inline; }
+  .footdef  { margin-bottom: 1em; }
+  .figure { padding: 1em; }
+  .figure p { text-align: center; }
+  .inlinetask {
+    padding: 10px;
+    border: 2px solid gray;
+    margin: 10px;
+    background: #ffffcc;
+  }
+  #org-div-home-and-up
+   { text-align: right; font-size: 70%; white-space: nowrap; }
+  textarea { overflow-x: auto; }
+  .linenr { font-size: smaller }
+  .code-highlighted { background-color: #ffff00; }
+  .org-info-js_info-navigation { border-style: none; }
+  #org-info-js_console-label
+    { font-size: 10px; font-weight: bold; white-space: nowrap; }
+  .org-info-js_search-highlight
+    { background-color: #ffff00; color: #000000; font-weight: bold; }
+  .org-svg { width: 90%; }
+  /*]]>*/-->
+</style>
+<link rel="stylesheet" type="text/css" href="freedombone.css" />
+<script type="text/javascript">
+/*
+@licstart  The following is the entire license notice for the
+JavaScript code in this tag.
+
+Copyright (C) 2012-2017 Free Software Foundation, Inc.
+
+The JavaScript code in this tag is free software: you can
+redistribute it and/or modify it under the terms of the GNU
+General Public License (GNU GPL) as published by the Free Software
+Foundation, either version 3 of the License, or (at your option)
+any later version.  The code is distributed WITHOUT ANY WARRANTY;
+without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
+
+As additional permission under GNU GPL version 3 section 7, you
+may distribute non-source (e.g., minimized or compacted) forms of
+that code without the copy of the GNU GPL normally required by
+section 4, provided you include this license notice and a URL
+through which recipients can access the Corresponding Source.
+
+
+@licend  The above is the entire license notice
+for the JavaScript code in this tag.
+*/
+<!--/*--><![CDATA[/*><!--*/
+ function CodeHighlightOn(elem, id)
+ {
+   var target = document.getElementById(id);
+   if(null != target) {
+     elem.cacheClassElem = elem.className;
+     elem.cacheClassTarget = target.className;
+     target.className = "code-highlighted";
+     elem.className   = "code-highlighted";
+   }
+ }
+ function CodeHighlightOff(elem, id)
+ {
+   var target = document.getElementById(id);
+   if(elem.cacheClassElem)
+     elem.className = elem.cacheClassElem;
+   if(elem.cacheClassTarget)
+     target.className = elem.cacheClassTarget;
+ }
+/*]]>*///-->
+</script>
+</head>
+<body>
+<div id="preamble" class="status">
+<a name="top" id="top"></a>
+</div>
+<div id="content">
+<div class="org-center">
+
+<div class="figure">
+<p><img src="images/logo.png" alt="logo.png" />
+</p>
+</div>
+</div>
+
+<center>
+<h1>Federated Wiki</h1>
+</center>
+
+<p>
+Federated wikis are a relatively new concept. There can be multiple copies of the same page on different servers and it's then easy to pick which version you prefer, or make something new. It's like wiki meets mashup meets federation, and so is different from many previous web paradigms and may take some recalibration of how you think the web should work.
+</p>
+
+<div id="outline-container-org18ce860" class="outline-2">
+<h2 id="org18ce860">Installation</h2>
+<div class="outline-text-2" id="text-org18ce860">
+<p>
+Log into your system with:
+</p>
+
+<div class="org-src-container">
+<pre class="src src-bash">ssh myusername@mydomain -p 2222
+</pre>
+</div>
+
+<p>
+Using cursor keys, space bar and Enter key select <b>Administrator controls</b> and type in your password.
+</p>
+
+<p>
+Select <b>Add/Remove Apps</b> then <b>fedwiki</b>. You will then be asked for a domain name and if you are using FreeDNS also the code for the domain which can be found under <b>Dynamic DNS</b> on the FreeDNS site (the random string from "<i>quick cron example</i>" which appears after <i>update.php?</i> and before <i>&gt;&gt;</i>). For more details on obtaining a domain and making it accessible via dynamic DNS see the <a href="./faq.html">FAQ</a>. Typically the domain name you use will be a subdomain, such as <i>wiki.mydomainname.net</i>. It will need to be a domain which you have bought somewhere and own and not one of the FreeDNS subdomains, otherwise you won't be able to get a SSL/TLS certificate for it.
+</p>
+</div>
+</div>
+
+
+<div id="outline-container-org6c011dd" class="outline-2">
+<h2 id="org6c011dd">Usage</h2>
+<div class="outline-text-2" id="text-org6c011dd">
+<p>
+First you'll need to get the login password, which can be found on the <b>Administrator control panel</b> under <b>Passwords</b> then <b>fedwiki</b>.
+</p>
+
+<p>
+Navigate to your wiki site then click on the <b>lock icon</b> at the bottom of the screen and enter the password. It should then appear unlocked. If you don't unlock then any edits you make won't be saved.
+</p>
+
+<p>
+There are a few things to know about using the federated wiki.
+</p>
+
+<ul class="org-ul">
+<li>You can edit by clicking on the <b>wiki</b> button at the bottom of the screen</li>
+<li>To edit a paragraph double click on it</li>
+<li>To remove a paragraph just delete all of its text</li>
+<li>Paragraphs can be dragged up and down to change their order, or moved between pages</li>
+<li>To add a new paragraph use the <b>+</b> button</li>
+<li>You can use left and right cursor keys to move through pages</li>
+<li>To claim/fork a page from another server click on the flag icon</li>
+<li>When done editing click on the <b>wiki</b> button again</li>
+<li>Different versions of the same page on different servers are represented by boxes at the bottom right of the screen. You can double click on them to see the different versions, and use the flag icon to fork if you prefer that version</li>
+</ul>
+</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

 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2017-12-20 Wed 23:36 -->
+<!-- 2018-01-05 Fri 21:25 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>&lrm;</title>
 </div>
 
 
-<div id="outline-container-org351bae6" class="outline-2">
-<h2 id="org351bae6">Akaunting</h2>
-<div class="outline-text-2" id="text-org351bae6">
+<div id="outline-container-orge16af4e" class="outline-2">
+<h2 id="orge16af4e">Akaunting</h2>
+<div class="outline-text-2" id="text-orge16af4e">
 <p>
 A web based accounts system for small businesses or freelancers.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-orge2d6b13" class="outline-2">
-<h2 id="orge2d6b13">CryptPad</h2>
-<div class="outline-text-2" id="text-orge2d6b13">
+<div id="outline-container-org6efc751" class="outline-2">
+<h2 id="org6efc751">CryptPad</h2>
+<div class="outline-text-2" id="text-org6efc751">
 <p>
 Collaborate on editing documents, presentations and source code, or vote on things. All with a good level of security.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org8762555" class="outline-2">
-<h2 id="org8762555">DLNA</h2>
-<div class="outline-text-2" id="text-org8762555">
+<div id="outline-container-org62f6d93" class="outline-2">
+<h2 id="org62f6d93">DLNA</h2>
+<div class="outline-text-2" id="text-org62f6d93">
 <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>
 </div>
 </div>
-<div id="outline-container-orgeb82d0e" class="outline-2">
-<h2 id="orgeb82d0e">Dokuwiki</h2>
-<div class="outline-text-2" id="text-orgeb82d0e">
+<div id="outline-container-orgf0c5fe6" class="outline-2">
+<h2 id="orgf0c5fe6">Dokuwiki</h2>
+<div class="outline-text-2" id="text-orgf0c5fe6">
 <p>
 A databaseless wiki system.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-orgd08f244" class="outline-2">
-<h2 id="orgd08f244">Emacs</h2>
-<div class="outline-text-2" id="text-orgd08f244">
+<div id="outline-container-org6d033b0" class="outline-2">
+<h2 id="org6d033b0">Emacs</h2>
+<div class="outline-text-2" id="text-org6d033b0">
 <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>
 </p>
 </div>
 </div>
-<div id="outline-container-orgae371e7" class="outline-2">
-<h2 id="orgae371e7">Etherpad</h2>
-<div class="outline-text-2" id="text-orgae371e7">
+<div id="outline-container-orgf1ad90c" class="outline-2">
+<h2 id="orgf1ad90c">Etherpad</h2>
+<div class="outline-text-2" id="text-orgf1ad90c">
 <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>
 </p>
 </div>
 </div>
-<div id="outline-container-org4300e45" class="outline-2">
-<h2 id="org4300e45">Friendica</h2>
-<div class="outline-text-2" id="text-org4300e45">
+<div id="outline-container-orgd1c7a69" class="outline-2">
+<h2 id="orgd1c7a69">Federated wiki</h2>
+<div class="outline-text-2" id="text-orgd1c7a69">
+<p>
+A new approach to creating wiki content.
+</p>
+
+<p>
+<a href="./app_fedwiki.html">How to use it</a>
+</p>
+</div>
+</div>
+<div id="outline-container-orgdf26871" class="outline-2">
+<h2 id="orgdf26871">Friendica</h2>
+<div class="outline-text-2" id="text-orgdf26871">
 <p>
 Federated social network system.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org8cae058" class="outline-2">
-<h2 id="org8cae058">Ghost</h2>
-<div class="outline-text-2" id="text-org8cae058">
+<div id="outline-container-org0c18927" class="outline-2">
+<h2 id="org0c18927">Ghost</h2>
+<div class="outline-text-2" id="text-org0c18927">
 <p>
 Modern looking blogging system.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org52c14c7" class="outline-2">
-<h2 id="org52c14c7">GNU Social</h2>
-<div class="outline-text-2" id="text-org52c14c7">
+<div id="outline-container-org6464a0f" class="outline-2">
+<h2 id="org6464a0f">GNU Social</h2>
+<div class="outline-text-2" id="text-org6464a0f">
 <p>
 Federated social network based on the OStatus protocol. You can "<i>remote follow</i>" other users within the GNU Social federation.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org1bb5d47" class="outline-2">
-<h2 id="org1bb5d47">Gogs</h2>
-<div class="outline-text-2" id="text-org1bb5d47">
+<div id="outline-container-orgc558982" class="outline-2">
+<h2 id="orgc558982">Gogs</h2>
+<div class="outline-text-2" id="text-orgc558982">
 <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>
 </p>
 </div>
 </div>
-<div id="outline-container-orgff3e945" class="outline-2">
-<h2 id="orgff3e945">HTMLy</h2>
-<div class="outline-text-2" id="text-orgff3e945">
+<div id="outline-container-org6c43921" class="outline-2">
+<h2 id="org6c43921">HTMLy</h2>
+<div class="outline-text-2" id="text-org6c43921">
 <p>
 Databaseless blogging system. Quite simple and with a markdown-like format.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-orgdc01553" class="outline-2">
-<h2 id="orgdc01553">Hubzilla</h2>
-<div class="outline-text-2" id="text-orgdc01553">
+<div id="outline-container-org7ac9b48" class="outline-2">
+<h2 id="org7ac9b48">Hubzilla</h2>
+<div class="outline-text-2" id="text-org7ac9b48">
 <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>
 </p>
 </div>
 </div>
-<div id="outline-container-orgea26aa5" class="outline-2">
-<h2 id="orgea26aa5">Icecast media stream</h2>
-<div class="outline-text-2" id="text-orgea26aa5">
+<div id="outline-container-org7ca0a6c" class="outline-2">
+<h2 id="org7ca0a6c">Icecast media stream</h2>
+<div class="outline-text-2" id="text-org7ca0a6c">
 <p>
 Make your own internet radio station.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-orgd35f348" class="outline-2">
-<h2 id="orgd35f348">IRC Server (ngirc)</h2>
-<div class="outline-text-2" id="text-orgd35f348">
+<div id="outline-container-org84ae949" class="outline-2">
+<h2 id="org84ae949">IRC Server (ngirc)</h2>
+<div class="outline-text-2" id="text-org84ae949">
 <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>
 </p>
 </div>
 </div>
-<div id="outline-container-org6a1a594" class="outline-2">
-<h2 id="org6a1a594">Jitsi Meet</h2>
-<div class="outline-text-2" id="text-org6a1a594">
+<div id="outline-container-orgf1eff7b" class="outline-2">
+<h2 id="orgf1eff7b">Jitsi Meet</h2>
+<div class="outline-text-2" id="text-orgf1eff7b">
 <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-org1ee358e" class="outline-2">
-<h2 id="org1ee358e">KanBoard</h2>
-<div class="outline-text-2" id="text-org1ee358e">
+<div id="outline-container-org35fd10e" class="outline-2">
+<h2 id="org35fd10e">KanBoard</h2>
+<div class="outline-text-2" id="text-org35fd10e">
 <p>
 A simple kanban system for managing projects or TODO lists.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-orge30d805" class="outline-2">
-<h2 id="orge30d805">Key Server</h2>
-<div class="outline-text-2" id="text-orge30d805">
+<div id="outline-container-orgce70d61" class="outline-2">
+<h2 id="orgce70d61">Key Server</h2>
+<div class="outline-text-2" id="text-orgce70d61">
 <p>
 An OpenPGP key server for storing and retrieving GPG public keys.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org240e85f" class="outline-2">
-<h2 id="org240e85f">Koel</h2>
-<div class="outline-text-2" id="text-org240e85f">
+<div id="outline-container-org92af635" class="outline-2">
+<h2 id="org92af635">Koel</h2>
+<div class="outline-text-2" id="text-org92af635">
 <p>
 Access your music collection from any internet connected device.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-orgb81a1c2" class="outline-2">
-<h2 id="orgb81a1c2">Lychee</h2>
-<div class="outline-text-2" id="text-orgb81a1c2">
+<div id="outline-container-org0a8722e" class="outline-2">
+<h2 id="org0a8722e">Lychee</h2>
+<div class="outline-text-2" id="text-org0a8722e">
 <p>
 Make your photo albums available on the web.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org1ad9b1b" class="outline-2">
-<h2 id="org1ad9b1b">Mailpile</h2>
-<div class="outline-text-2" id="text-org1ad9b1b">
+<div id="outline-container-orgdda9e48" class="outline-2">
+<h2 id="orgdda9e48">Mailpile</h2>
+<div class="outline-text-2" id="text-orgdda9e48">
 <p>
 Modern email client which supports GPG encryption.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-orgbb8fed1" class="outline-2">
-<h2 id="orgbb8fed1">Matrix</h2>
-<div class="outline-text-2" id="text-orgbb8fed1">
+<div id="outline-container-org0e639e8" class="outline-2">
+<h2 id="org0e639e8">Matrix</h2>
+<div class="outline-text-2" id="text-org0e639e8">
 <p>
 Multi-user chat with some security and moderation controls.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org264a933" class="outline-2">
-<h2 id="org264a933">Mediagoblin</h2>
-<div class="outline-text-2" id="text-org264a933">
+<div id="outline-container-org67e6388" class="outline-2">
+<h2 id="org67e6388">Mediagoblin</h2>
+<div class="outline-text-2" id="text-org67e6388">
 <p>
 Publicly host video and audio files so that you don't need to use YouTube/Vimeo/etc.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org5f27565" class="outline-2">
-<h2 id="org5f27565">Mumble</h2>
-<div class="outline-text-2" id="text-org5f27565">
+<div id="outline-container-org95ad392" class="outline-2">
+<h2 id="org95ad392">Mumble</h2>
+<div class="outline-text-2" id="text-org95ad392">
 <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>
 </p>
 </div>
 </div>
-<div id="outline-container-org532c52b" class="outline-2">
-<h2 id="org532c52b">NextCloud</h2>
-<div class="outline-text-2" id="text-org532c52b">
+<div id="outline-container-org83f8149" class="outline-2">
+<h2 id="org83f8149">NextCloud</h2>
+<div class="outline-text-2" id="text-org83f8149">
 <p>
 Store files on your server and sync them with laptops or mobile devices. Includes many plugins including videoconferencing and collaborative document editing.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org9067728" class="outline-2">
-<h2 id="org9067728">PeerTube</h2>
-<div class="outline-text-2" id="text-org9067728">
+<div id="outline-container-org34376ed" class="outline-2">
+<h2 id="org34376ed">PeerTube</h2>
+<div class="outline-text-2" id="text-org34376ed">
 <p>
 Peer-to-peer video hosting. Similar to Mediagoblin, but the P2P aspect better enables the streaming load to be shared across servers.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-orgf62f97e" class="outline-2">
-<h2 id="orgf62f97e">PI-Hole</h2>
-<div class="outline-text-2" id="text-orgf62f97e">
+<div id="outline-container-org5f60689" class="outline-2">
+<h2 id="org5f60689">PI-Hole</h2>
+<div class="outline-text-2" id="text-org5f60689">
 <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>
 </p>
 </div>
 </div>
-<div id="outline-container-orgdb42e0c" class="outline-2">
-<h2 id="orgdb42e0c">Pleroma</h2>
-<div class="outline-text-2" id="text-orgdb42e0c">
+<div id="outline-container-org701c17b" class="outline-2">
+<h2 id="org701c17b">Pleroma</h2>
+<div class="outline-text-2" id="text-org701c17b">
 <p>
 Pleroma is an OStatus-compatible social networking server, compatible with GNU Social, PostActiv and Mastodon. It is high-performance and so is especially well suited for running on low power single board computers without much RAM.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org13c41ff" class="outline-2">
-<h2 id="org13c41ff">PostActiv</h2>
-<div class="outline-text-2" id="text-org13c41ff">
+<div id="outline-container-org1b0cb48" class="outline-2">
+<h2 id="org1b0cb48">PostActiv</h2>
+<div class="outline-text-2" id="text-org1b0cb48">
 <p>
 An alternative federated social networking system compatible with GNU Social, Pleroma and Mastodon. It includes some optimisations and fixes currently not available within the main GNU Social project.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org2eaba6a" class="outline-2">
-<h2 id="org2eaba6a">Profanity</h2>
-<div class="outline-text-2" id="text-org2eaba6a">
+<div id="outline-container-org160c5ab" class="outline-2">
+<h2 id="org160c5ab">Profanity</h2>
+<div class="outline-text-2" id="text-org160c5ab">
 <p>
 A shell based XMPP client which you can run on the Freedombone server via ssh.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org201d591" class="outline-2">
-<h2 id="org201d591">Riot Web</h2>
-<div class="outline-text-2" id="text-org201d591">
+<div id="outline-container-org9d02ce0" class="outline-2">
+<h2 id="org9d02ce0">Riot Web</h2>
+<div class="outline-text-2" id="text-org9d02ce0">
 <p>
 A browser based user interface for the Matrix federated communications system, including WebRTC audio and video chat.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org46bc137" class="outline-2">
-<h2 id="org46bc137">SearX</h2>
-<div class="outline-text-2" id="text-org46bc137">
+<div id="outline-container-org737de9a" class="outline-2">
+<h2 id="org737de9a">SearX</h2>
+<div class="outline-text-2" id="text-org737de9a">
 <p>
 A metasearch engine for customised and private web searches.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org8fff378" class="outline-2">
-<h2 id="org8fff378">tt-rss</h2>
-<div class="outline-text-2" id="text-org8fff378">
+<div id="outline-container-org13d4ded" class="outline-2">
+<h2 id="org13d4ded">tt-rss</h2>
+<div class="outline-text-2" id="text-org13d4ded">
 <p>
 Private RSS reader. Pulls in RSS/Atom feeds via Tor and is only accessible via an onion address. Have "<i>the right to read</i>" without the Surveillance State knowing what you're reading. Also available with a user interface suitable for viewing on mobile devices via a browser such as OrFox.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org932f267" class="outline-2">
-<h2 id="org932f267">Syncthing</h2>
-<div class="outline-text-2" id="text-org932f267">
+<div id="outline-container-org7dfad5f" class="outline-2">
+<h2 id="org7dfad5f">Syncthing</h2>
+<div class="outline-text-2" id="text-org7dfad5f">
 <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>
 </p>
 </div>
 </div>
-<div id="outline-container-orgba7f3d8" class="outline-2">
-<h2 id="orgba7f3d8">Tahoe-LAFS</h2>
-<div class="outline-text-2" id="text-orgba7f3d8">
+<div id="outline-container-org1f099ea" class="outline-2">
+<h2 id="org1f099ea">Tahoe-LAFS</h2>
+<div class="outline-text-2" id="text-org1f099ea">
 <p>
 Robust and encrypted storage of files on one or more server.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org9a4f66a" class="outline-2">
-<h2 id="org9a4f66a">Tox</h2>
-<div class="outline-text-2" id="text-org9a4f66a">
+<div id="outline-container-org9b9d283" class="outline-2">
+<h2 id="org9b9d283">Tox</h2>
+<div class="outline-text-2" id="text-org9b9d283">
 <p>
 Client and bootstrap node for the Tox chat/VoIP system.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org94d43e3" class="outline-2">
-<h2 id="org94d43e3">Turtl</h2>
-<div class="outline-text-2" id="text-org94d43e3">
+<div id="outline-container-org85e51e9" class="outline-2">
+<h2 id="org85e51e9">Turtl</h2>
+<div class="outline-text-2" id="text-org85e51e9">
 <p>
 A system for privately creating and sharing notes and images, similar to Evernote but without the spying.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org46fcb91" class="outline-2">
-<h2 id="org46fcb91">Vim</h2>
-<div class="outline-text-2" id="text-org46fcb91">
+<div id="outline-container-orgb589515" class="outline-2">
+<h2 id="orgb589515">Vim</h2>
+<div class="outline-text-2" id="text-orgb589515">
 <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-org867a756" class="outline-2">
-<h2 id="org867a756">Virtual Private Network (VPN)</h2>
-<div class="outline-text-2" id="text-org867a756">
+<div id="outline-container-org5ba4463" class="outline-2">
+<h2 id="org5ba4463">Virtual Private Network (VPN)</h2>
+<div class="outline-text-2" id="text-org5ba4463">
 <p>
 Set up a VPN on your server so that you can bypass local internet censorship.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-orge4cd08a" class="outline-2">
-<h2 id="orge4cd08a">XMPP</h2>
-<div class="outline-text-2" id="text-orge4cd08a">
+<div id="outline-container-org4198c39" class="outline-2">
+<h2 id="org4198c39">XMPP</h2>
+<div class="outline-text-2" id="text-org4198c39">
 <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>