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

doc/EN/apps.org

 The black hole for web adverts. Block adverts at the domain name level within your local network. It can significantly reduce bandwidth, speed up page load times and protect your systems from being tracked by spyware.
 
 [[./app_pihole.html][How to use it]]
-* Pleroma
-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.
-
-[[./app_pleroma.html][How to use it]]
 * PostActiv
 An alternative federated social networking system compatible with GNU Social, Pleroma and Mastodon. It includes some optimisations and fixes currently not available within the main GNU Social project.
 

src/freedombone-app-ghost

 #                    Freedom in the Cloud
 #
 # Ghost blog
-# Only works with nodejs version ^6.9.0
 #
 # License
 # =======

src/freedombone-app-pleroma

 # Pleroma backend application
 # https://git.pleroma.social/pleroma/pleroma/wikis/Installing-on-Debian-Based-Distributions
 #
+# Show stopper: This is dependent on https://placehold.it for avatar images,
+# so at present it's not usable until a first party placeholder image system
+# is included.
+#
+# There is also a possible issue with the chat system which uses an object called
+# "Agent" which may not be supported with the version of elixir within the
+# Debian package. This only applies if you're installing from the latest commit.
+#
 # License
 # =======
 #
-# Copyright (C) 2017 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2017-2018 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-VARIANTS='full full-vim social'
+VARIANTS=''
 
 IN_DEFAULT_INSTALL=0
 SHOW_ON_ABOUT=1
 PLEROMA_PORT=4000
 PLEROMA_ONION_PORT=8011
 PLEROMA_REPO="https://git.pleroma.social/pleroma/pleroma.git"
-PLEROMA_COMMIT='5c09d8d3f199a3f323471f9ba4578371226cd726'
+PLEROMA_COMMIT='c1fa1e8844c8eae1ad7638a2d7f9d00e8cd07ce8'
 PLEROMA_ADMIN_PASSWORD=
 PLEROMA_DIR=/etc/pleroma
 PLEROMA_SECRET_KEY=""
     #${PROJECT_NAME}-pass -u "$curr_username" -a pleroma -p "$new_user_password"
 }
 
+function pleroma_create_database_failed {
+    run_system_query_postgresql "ALTER USER pleroma NOSUPERUSER;"
+    run_system_query_postgresql "ALTER USER pleroma NOCREATEDB;"
+}
+
 function pleroma_create_database {
     if [ -f $IMAGE_PASSWORD_FILE ]; then
         PLEROMA_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
     if [ ${#PLEROMA_SECRET_KEY} -lt 64 ]; then
         PLEROMA_SECRET_KEY="$(create_password 30)$(create_password 30)$(create_password 30)"
         if [ ${#PLEROMA_SECRET_KEY} -lt 64 ]; then
-            run_system_query_postgresql "ALTER USER pleroma NOSUPERUSER;"
-            run_system_query_postgresql "ALTER USER pleroma NOCREATEDB;"
+            pleroma_create_database_failed
             echo $'Pleroma secret key not created'
             exit 6782352
         fi
         write_config_param "PLEROMA_SECRET_KEY" "$PLEROMA_SECRET_KEY"
     fi
 
-    pleroma_secret=config/dev.secret.exs
-    cp config/dev.exs $pleroma_secret
+    if [ ! -d $PLEROMA_DIR/config ]; then
+        echo $"Missing directory $PLEROMA_DIR/config"
+        exit 7835393
+    fi
+    pleroma_secret=$PLEROMA_DIR/config/dev.secret.exs
+    if [ ! -f $PLEROMA_DIR/config/dev.exs ]; then
+        echo $"Did not find $PLEROMA_DIR/config/dev.exs"
+        exit 78923528
+    fi
+    cp $PLEROMA_DIR/config/dev.exs $pleroma_secret
     sed -i "s|username:.*|username: \"pleroma\",|g" $pleroma_secret
     sed -i "s|password:.*|password: \"$PLEROMA_ADMIN_PASSWORD\",|g" $pleroma_secret
     sed -i "s|database:.*|database: \"pleroma\",|g" $pleroma_secret
     else
         sed -i 's|pbkdf2_rounds.*|pbkdf2_rounds, 1|g' $pleroma_secret
     fi
+    sed -i 's|import_config|# import_config|g' $pleroma_secret
 
     cd $PLEROMA_DIR
-    chown -R pleroma:pleroma *
+    chown -R pleroma:pleroma $PLEROMA_DIR/*
     sudo -u pleroma mix local.rebar --force
     if [ ! "$?" = "0" ]; then
-        run_system_query_postgresql "ALTER USER pleroma NOSUPERUSER;"
-        run_system_query_postgresql "ALTER USER pleroma NOCREATEDB;"
+        pleroma_create_database_failed
         echo $'mix local.rebar failed'
         exit 73528562
     fi
     systemctl restart postgresql
     sudo -u pleroma mix ecto.create --force
     if [ ! "$?" = "0" ]; then
-        run_system_query_postgresql "ALTER USER pleroma NOSUPERUSER;"
-        run_system_query_postgresql "ALTER USER pleroma NOCREATEDB;"
+        pleroma_create_database_failed
         echo $'mix ecto.create failed'
         exit 83653582
     fi
     sudo -u pleroma mix ecto.migrate --force
     if [ ! "$?" = "0" ]; then
-        run_system_query_postgresql "ALTER USER pleroma NOSUPERUSER;"
-        run_system_query_postgresql "ALTER USER pleroma NOCREATEDB;"
+        pleroma_create_database_failed
         echo $'mix ecto.migrate failed'
         exit 73752573
     fi

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>
-<!-- 2018-01-05 Fri 21:25 -->
+<!-- 2018-01-10 Wed 14:24 -->
 <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-orge16af4e" class="outline-2">
-<h2 id="orge16af4e">Akaunting</h2>
-<div class="outline-text-2" id="text-orge16af4e">
+<div id="outline-container-org8e1c6de" class="outline-2">
+<h2 id="org8e1c6de">Akaunting</h2>
+<div class="outline-text-2" id="text-org8e1c6de">
 <p>
 A web based accounts system for small businesses or freelancers.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org6efc751" class="outline-2">
-<h2 id="org6efc751">CryptPad</h2>
-<div class="outline-text-2" id="text-org6efc751">
+<div id="outline-container-org5781982" class="outline-2">
+<h2 id="org5781982">CryptPad</h2>
+<div class="outline-text-2" id="text-org5781982">
 <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-org62f6d93" class="outline-2">
-<h2 id="org62f6d93">DLNA</h2>
-<div class="outline-text-2" id="text-org62f6d93">
+<div id="outline-container-org634d134" class="outline-2">
+<h2 id="org634d134">DLNA</h2>
+<div class="outline-text-2" id="text-org634d134">
 <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-orgf0c5fe6" class="outline-2">
-<h2 id="orgf0c5fe6">Dokuwiki</h2>
-<div class="outline-text-2" id="text-orgf0c5fe6">
+<div id="outline-container-org3ef1ba1" class="outline-2">
+<h2 id="org3ef1ba1">Dokuwiki</h2>
+<div class="outline-text-2" id="text-org3ef1ba1">
 <p>
 A databaseless wiki system.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org6d033b0" class="outline-2">
-<h2 id="org6d033b0">Emacs</h2>
-<div class="outline-text-2" id="text-org6d033b0">
+<div id="outline-container-orgd8f4217" class="outline-2">
+<h2 id="orgd8f4217">Emacs</h2>
+<div class="outline-text-2" id="text-orgd8f4217">
 <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-orgf1ad90c" class="outline-2">
-<h2 id="orgf1ad90c">Etherpad</h2>
-<div class="outline-text-2" id="text-orgf1ad90c">
+<div id="outline-container-orgf878069" class="outline-2">
+<h2 id="orgf878069">Etherpad</h2>
+<div class="outline-text-2" id="text-orgf878069">
 <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-orgd1c7a69" class="outline-2">
-<h2 id="orgd1c7a69">Federated wiki</h2>
-<div class="outline-text-2" id="text-orgd1c7a69">
+<div id="outline-container-org9a9c4f3" class="outline-2">
+<h2 id="org9a9c4f3">Federated wiki</h2>
+<div class="outline-text-2" id="text-org9a9c4f3">
 <p>
 A new approach to creating wiki content.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-orgdf26871" class="outline-2">
-<h2 id="orgdf26871">Friendica</h2>
-<div class="outline-text-2" id="text-orgdf26871">
+<div id="outline-container-org91b656b" class="outline-2">
+<h2 id="org91b656b">Friendica</h2>
+<div class="outline-text-2" id="text-org91b656b">
 <p>
 Federated social network system.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org0c18927" class="outline-2">
-<h2 id="org0c18927">Ghost</h2>
-<div class="outline-text-2" id="text-org0c18927">
+<div id="outline-container-org271eb94" class="outline-2">
+<h2 id="org271eb94">Ghost</h2>
+<div class="outline-text-2" id="text-org271eb94">
 <p>
 Modern looking blogging system.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org6464a0f" class="outline-2">
-<h2 id="org6464a0f">GNU Social</h2>
-<div class="outline-text-2" id="text-org6464a0f">
+<div id="outline-container-orga389f87" class="outline-2">
+<h2 id="orga389f87">GNU Social</h2>
+<div class="outline-text-2" id="text-orga389f87">
 <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-orgc558982" class="outline-2">
-<h2 id="orgc558982">Gogs</h2>
-<div class="outline-text-2" id="text-orgc558982">
+<div id="outline-container-org25dbd8b" class="outline-2">
+<h2 id="org25dbd8b">Gogs</h2>
+<div class="outline-text-2" id="text-org25dbd8b">
 <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-org6c43921" class="outline-2">
-<h2 id="org6c43921">HTMLy</h2>
-<div class="outline-text-2" id="text-org6c43921">
+<div id="outline-container-orga0d0944" class="outline-2">
+<h2 id="orga0d0944">HTMLy</h2>
+<div class="outline-text-2" id="text-orga0d0944">
 <p>
 Databaseless blogging system. Quite simple and with a markdown-like format.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org7ac9b48" class="outline-2">
-<h2 id="org7ac9b48">Hubzilla</h2>
-<div class="outline-text-2" id="text-org7ac9b48">
+<div id="outline-container-orgaee8baf" class="outline-2">
+<h2 id="orgaee8baf">Hubzilla</h2>
+<div class="outline-text-2" id="text-orgaee8baf">
 <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-org7ca0a6c" class="outline-2">
-<h2 id="org7ca0a6c">Icecast media stream</h2>
-<div class="outline-text-2" id="text-org7ca0a6c">
+<div id="outline-container-org96c213d" class="outline-2">
+<h2 id="org96c213d">Icecast media stream</h2>
+<div class="outline-text-2" id="text-org96c213d">
 <p>
 Make your own internet radio station.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org84ae949" class="outline-2">
-<h2 id="org84ae949">IRC Server (ngirc)</h2>
-<div class="outline-text-2" id="text-org84ae949">
+<div id="outline-container-org1b6fde5" class="outline-2">
+<h2 id="org1b6fde5">IRC Server (ngirc)</h2>
+<div class="outline-text-2" id="text-org1b6fde5">
 <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-orgf1eff7b" class="outline-2">
-<h2 id="orgf1eff7b">Jitsi Meet</h2>
-<div class="outline-text-2" id="text-orgf1eff7b">
+<div id="outline-container-org96e6f4f" class="outline-2">
+<h2 id="org96e6f4f">Jitsi Meet</h2>
+<div class="outline-text-2" id="text-org96e6f4f">
 <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-org35fd10e" class="outline-2">
-<h2 id="org35fd10e">KanBoard</h2>
-<div class="outline-text-2" id="text-org35fd10e">
+<div id="outline-container-orge07f1f9" class="outline-2">
+<h2 id="orge07f1f9">KanBoard</h2>
+<div class="outline-text-2" id="text-orge07f1f9">
 <p>
 A simple kanban system for managing projects or TODO lists.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-orgce70d61" class="outline-2">
-<h2 id="orgce70d61">Key Server</h2>
-<div class="outline-text-2" id="text-orgce70d61">
+<div id="outline-container-orgd69a78b" class="outline-2">
+<h2 id="orgd69a78b">Key Server</h2>
+<div class="outline-text-2" id="text-orgd69a78b">
 <p>
 An OpenPGP key server for storing and retrieving GPG public keys.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org92af635" class="outline-2">
-<h2 id="org92af635">Koel</h2>
-<div class="outline-text-2" id="text-org92af635">
+<div id="outline-container-org84e4e1c" class="outline-2">
+<h2 id="org84e4e1c">Koel</h2>
+<div class="outline-text-2" id="text-org84e4e1c">
 <p>
 Access your music collection from any internet connected device.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org0a8722e" class="outline-2">
-<h2 id="org0a8722e">Lychee</h2>
-<div class="outline-text-2" id="text-org0a8722e">
+<div id="outline-container-org92b57ea" class="outline-2">
+<h2 id="org92b57ea">Lychee</h2>
+<div class="outline-text-2" id="text-org92b57ea">
 <p>
 Make your photo albums available on the web.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-orgdda9e48" class="outline-2">
-<h2 id="orgdda9e48">Mailpile</h2>
-<div class="outline-text-2" id="text-orgdda9e48">
+<div id="outline-container-orgeb1cdb7" class="outline-2">
+<h2 id="orgeb1cdb7">Mailpile</h2>
+<div class="outline-text-2" id="text-orgeb1cdb7">
 <p>
 Modern email client which supports GPG encryption.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org0e639e8" class="outline-2">
-<h2 id="org0e639e8">Matrix</h2>
-<div class="outline-text-2" id="text-org0e639e8">
+<div id="outline-container-org48106ac" class="outline-2">
+<h2 id="org48106ac">Matrix</h2>
+<div class="outline-text-2" id="text-org48106ac">
 <p>
 Multi-user chat with some security and moderation controls.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org67e6388" class="outline-2">
-<h2 id="org67e6388">Mediagoblin</h2>
-<div class="outline-text-2" id="text-org67e6388">
+<div id="outline-container-orgdb0e51d" class="outline-2">
+<h2 id="orgdb0e51d">Mediagoblin</h2>
+<div class="outline-text-2" id="text-orgdb0e51d">
 <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-org95ad392" class="outline-2">
-<h2 id="org95ad392">Mumble</h2>
-<div class="outline-text-2" id="text-org95ad392">
+<div id="outline-container-org12e0a7d" class="outline-2">
+<h2 id="org12e0a7d">Mumble</h2>
+<div class="outline-text-2" id="text-org12e0a7d">
 <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-org83f8149" class="outline-2">
-<h2 id="org83f8149">NextCloud</h2>
-<div class="outline-text-2" id="text-org83f8149">
+<div id="outline-container-org6d141d2" class="outline-2">
+<h2 id="org6d141d2">NextCloud</h2>
+<div class="outline-text-2" id="text-org6d141d2">
 <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-org34376ed" class="outline-2">
-<h2 id="org34376ed">PeerTube</h2>
-<div class="outline-text-2" id="text-org34376ed">
+<div id="outline-container-orgfbcc2bd" class="outline-2">
+<h2 id="orgfbcc2bd">PeerTube</h2>
+<div class="outline-text-2" id="text-orgfbcc2bd">
 <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-org5f60689" class="outline-2">
-<h2 id="org5f60689">PI-Hole</h2>
-<div class="outline-text-2" id="text-org5f60689">
+<div id="outline-container-org460d63a" class="outline-2">
+<h2 id="org460d63a">PI-Hole</h2>
+<div class="outline-text-2" id="text-org460d63a">
 <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-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>
-<a href="./app_pleroma.html">How to use it</a>
-</p>
-</div>
-</div>
-<div id="outline-container-org1b0cb48" class="outline-2">
-<h2 id="org1b0cb48">PostActiv</h2>
-<div class="outline-text-2" id="text-org1b0cb48">
+<div id="outline-container-org65deb16" class="outline-2">
+<h2 id="org65deb16">PostActiv</h2>
+<div class="outline-text-2" id="text-org65deb16">
 <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-org160c5ab" class="outline-2">
-<h2 id="org160c5ab">Profanity</h2>
-<div class="outline-text-2" id="text-org160c5ab">
+<div id="outline-container-org8852da5" class="outline-2">
+<h2 id="org8852da5">Profanity</h2>
+<div class="outline-text-2" id="text-org8852da5">
 <p>
 A shell based XMPP client which you can run on the Freedombone server via ssh.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org9d02ce0" class="outline-2">
-<h2 id="org9d02ce0">Riot Web</h2>
-<div class="outline-text-2" id="text-org9d02ce0">
+<div id="outline-container-org262f5c6" class="outline-2">
+<h2 id="org262f5c6">Riot Web</h2>
+<div class="outline-text-2" id="text-org262f5c6">
 <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-org737de9a" class="outline-2">
-<h2 id="org737de9a">SearX</h2>
-<div class="outline-text-2" id="text-org737de9a">
+<div id="outline-container-org5c685c7" class="outline-2">
+<h2 id="org5c685c7">SearX</h2>
+<div class="outline-text-2" id="text-org5c685c7">
 <p>
 A metasearch engine for customised and private web searches.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org13d4ded" class="outline-2">
-<h2 id="org13d4ded">tt-rss</h2>
-<div class="outline-text-2" id="text-org13d4ded">
+<div id="outline-container-org609aeef" class="outline-2">
+<h2 id="org609aeef">tt-rss</h2>
+<div class="outline-text-2" id="text-org609aeef">
 <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-org7dfad5f" class="outline-2">
-<h2 id="org7dfad5f">Syncthing</h2>
-<div class="outline-text-2" id="text-org7dfad5f">
+<div id="outline-container-orgf0d4a79" class="outline-2">
+<h2 id="orgf0d4a79">Syncthing</h2>
+<div class="outline-text-2" id="text-orgf0d4a79">
 <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-org1f099ea" class="outline-2">
-<h2 id="org1f099ea">Tahoe-LAFS</h2>
-<div class="outline-text-2" id="text-org1f099ea">
+<div id="outline-container-org91cbbcf" class="outline-2">
+<h2 id="org91cbbcf">Tahoe-LAFS</h2>
+<div class="outline-text-2" id="text-org91cbbcf">
 <p>
 Robust and encrypted storage of files on one or more server.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org9b9d283" class="outline-2">
-<h2 id="org9b9d283">Tox</h2>
-<div class="outline-text-2" id="text-org9b9d283">
+<div id="outline-container-orgf95d31b" class="outline-2">
+<h2 id="orgf95d31b">Tox</h2>
+<div class="outline-text-2" id="text-orgf95d31b">
 <p>
 Client and bootstrap node for the Tox chat/VoIP system.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org85e51e9" class="outline-2">
-<h2 id="org85e51e9">Turtl</h2>
-<div class="outline-text-2" id="text-org85e51e9">
+<div id="outline-container-org20594a2" class="outline-2">
+<h2 id="org20594a2">Turtl</h2>
+<div class="outline-text-2" id="text-org20594a2">
 <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-orgb589515" class="outline-2">
-<h2 id="orgb589515">Vim</h2>
-<div class="outline-text-2" id="text-orgb589515">
+<div id="outline-container-orga4d94aa" class="outline-2">
+<h2 id="orga4d94aa">Vim</h2>
+<div class="outline-text-2" id="text-orga4d94aa">
 <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-org5ba4463" class="outline-2">
-<h2 id="org5ba4463">Virtual Private Network (VPN)</h2>
-<div class="outline-text-2" id="text-org5ba4463">
+<div id="outline-container-org83399c4" class="outline-2">
+<h2 id="org83399c4">Virtual Private Network (VPN)</h2>
+<div class="outline-text-2" id="text-org83399c4">
 <p>
 Set up a VPN on your server so that you can bypass local internet censorship.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org4198c39" class="outline-2">
-<h2 id="org4198c39">XMPP</h2>
-<div class="outline-text-2" id="text-org4198c39">
+<div id="outline-container-org409bdd6" class="outline-2">
+<h2 id="org409bdd6">XMPP</h2>
+<div class="outline-text-2" id="text-org409bdd6">
 <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>