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

README.md

@@ -2,7 +2,7 @@
 
 > _"With the increasing move of our computing to cloud infrastructures, we give up the control of our computing to the managers of those infrastructures. Our terminals (laptops, desktops) might now be running entirely on Free Software, but this is increasingly irrelevant given that most of what actually matters gets executed on a remote closed system that we don’t control. The Free Software community needs to work to help users keep the control of all their computing, by developing suitable alternatives and facilitating their deployment."_ -- Lucas Nussbaum
 
-<img src="https://github.com/bashrc/freedombone/blob/master/img/beaglebone_logo.jpg?raw=true" width=800/>
+<img src="https://github.com/bashrc/freedombone/blob/master/img/bbb_above.jpg?raw=true" width=800/>
 
 So you want to run your own internet services? Email, chat, VoIP, web sites, file synchronisation, wikis, blogs, social networks, media hosting, backups, VPN. Freedombone enables you to do all of that in a self-hosted way, where you keep control of your data and it resides in your own home.
 

doc/EN/app_pleroma.org

@@ -10,11 +10,9 @@
 [[file:images/logo.png]]
 #+END_CENTER
 
-#+BEGIN_EXPORT html
-<center>
-<h1>Pleroma</h1>
-</center>
-#+END_EXPORT
+#+BEGIN_CENTER
+[[file:images/pleroma-logo.png]]
+#+END_CENTER
 
 Pleroma is an OStatus-compatible social networking server, compatible with GNU Social, PostActiv and Mastodon. It is high-performance and so is especially well suited for running on low power single board computers without much RAM.
 

doc/EN/faq.org

@@ -17,6 +17,11 @@
 #+END_EXPORT
 
 #+BEGIN_CENTER
+[[file:images/surveillanceoptions.jpg]]
+/Possible options for dealing with bulk surveillance at The Glass Room exhibition, 2017/
+#+END_CENTER
+
+#+BEGIN_CENTER
 #+ATTR_HTML: :border -1
 | [[What applications are supported?]]                                                          |
 | [[I don't have a static IP address. Can I still install this system?]]                        |

src/freedombone-app-pleroma

@@ -386,6 +386,99 @@ function pleroma_disable_registrations {
     pleroma_recompile
 }
 
+function pleroma_add_emoji {
+    emoji_resolution='128x128'
+
+    data=$(tempfile 2>/dev/null)
+    trap "rm -f $data" 0 1 2 5 15
+    dialog --backtitle $"Freedombone Control Panel" \
+           --title $"Add Custom Emoji" \
+           --form "\n" 8 75 2 \
+           $"Shortcode:" 1 1 "" 1 18 16 15 \
+           $"ImageURL:" 2 1 "" 2 18 512 10000 \
+           2> $data
+    sel=$?
+    case $sel in
+        1) return;;
+        255) return;;
+    esac
+    shortcode=$(cat $data | sed -n 1p)
+    image_url=$(cat $data | sed -n 2p)
+    rm $data
+    if [ ${#shortcode} -lt 2 ]; then
+        return
+    fi
+    if [ ${#image_url} -lt 2 ]; then
+        return
+    fi
+    if [[ "$image_url" != *'.'* ]]; then
+        return
+    fi
+    if [[ "$image_url" != *'.png' && "$image_url" != *'.jpg' && "$image_url" != *'.jpeg' && "$image_url" != *'.gif' ]]; then
+        dialog --title $"Add Custom Emoji" \
+               --msgbox $"The image must be png/jpg/gif format" 6 60
+        return
+    fi
+    if [[ "$shortcode" == *':'* || "$shortcode" == *' '* || "$shortcode" == *'.'* || "$shortcode" == *'!'* ]]; then
+        dialog --title $"Add Custom Emoji" \
+               --msgbox $"The shortcode contains invalid characters" 6 60
+        return
+    fi
+
+    image_extension='png'
+    if [[ "$image_url" == *'.jpg' || "$image_url" == *'.jpeg' ]]; then
+        image_extension='jpg'
+    fi
+    if [[ "$image_url" == *'.gif' ]]; then
+        image_extension='gif'
+    fi
+
+    if [ ! -d $PLEROMA_DIR/priv/static/emoji ]; then
+        mkdir -p $PLEROMA_DIR/priv/static/emoji
+    fi
+
+    image_filename=$PLEROMA_DIR/priv/static/emoji/${shortcode}.${image_extension}
+    wget "$image_url" -O $image_filename
+    if [ ! -f $image_filename ]; then
+        dialog --title $"Add Custom Emoji" \
+               --msgbox $"Unable to download the image" 6 60
+        return
+    fi
+
+    if [[ "$image_url" == *'.jpg' || "$image_url" == *'.jpeg' || "$image_url" == *'.gif' ]]; then
+        convert $image_filename -resize $emoji_resolution $PLEROMA_DIR/priv/static/emoji/${shortcode}.png
+        if [ ! -f $PLEROMA_DIR/priv/static/emoji/${shortcode}.png ]; then
+            dialog --title $"Add Custom Emoji" \
+                   --msgbox $"Unable to convert empji image to png format" 6 60
+            return
+        fi
+
+        # remove the original
+        rm $image_filename
+
+        image_extension='png'
+        image_filename=$PLEROMA_DIR/priv/static/emoji/${shortcode}.${image_extension}
+    else
+        convert $image_filename -resize $emoji_resolution $image_filename
+    fi
+
+    if ! grep -q "${shortcode}," $PLEROMA_DIR/config/emoji.txt; then
+        echo "${shortcode}, /emoji/${shortcode}.${image_extension}" >> $PLEROMA_DIR/config/emoji.txt
+    else
+        sed -i "s|${shortcode},.*|${shortcode}, /emoji/${shortcode}.${image_extension}|g" $PLEROMA_DIR/config/emoji.txt
+    fi
+
+    chown -R pleroma:pleroma $PLEROMA_DIR
+    clear
+    echo ''
+    echo $'Recompiling Pleroma with the new emoji'
+    systemctl stop pleroma
+    pleroma_recompile
+
+    dialog --title $"Add Custom Emoji" \
+           --msgbox $"Custom emoji :${shortcode}: has been added" 6 70
+}
+
 function configure_interactive_pleroma {
     read_config_param PLEROMA_EXPIRE_MONTHS
     while true
@@ -394,12 +487,13 @@ function configure_interactive_pleroma {
         trap "rm -f $data" 0 1 2 5 15
         dialog --backtitle $"Freedombone Control Panel" \
                --title $"Pleroma" \
-               --radiolist $"Choose an operation:" 14 70 5 \
+               --radiolist $"Choose an operation:" 15 70 6 \
                1 $"Set a background image" off \
                2 $"Set the title" off \
                3 $"Disable new account registrations" off \
-               4 $"Set post expiry period (currently $PLEROMA_EXPIRE_MONTHS months)" off \
-               5 $"Exit" on 2> $data
+               4 $"Add a custom emoji" off \
+               5 $"Set post expiry period (currently $PLEROMA_EXPIRE_MONTHS months)" off \
+               6 $"Exit" on 2> $data
         sel=$?
         case $sel in
             1) return;;
@@ -409,8 +503,9 @@ function configure_interactive_pleroma {
             1) pleroma_set_background_image;;
             2) pleroma_set_title;;
             3) pleroma_disable_registrations;;
-            4) pleroma_set_expire_months;;
-            5) break;;
+            4) pleroma_add_emoji;;
+            5) pleroma_set_expire_months;;
+            6) break;;
         esac
         rm $data
     done
@@ -606,6 +701,8 @@ function install_pleroma {
         ONION_ONLY='no'
     fi
 
+    apt-get -yq install wget imagemagick
+
     # We need elixir 1.4+ here, so the debian repo package won't do
     install_elixir
 

src/freedombone-utils-postgresql

@@ -120,7 +120,6 @@ function run_query_postgresql_with_output {
     database_name=$1
     database_query=$2
     output=$(sudo -u postgres psql -d $database_name -c << EOF
-use $database_name;
 $database_query
 EOF
 )

website/EN/app_pleroma.html

@@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2017-11-08 Wed 14:34 -->
+<!-- 2017-11-10 Fri 17:42 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>&lrm;</title>
@@ -244,9 +244,13 @@ for the JavaScript code in this tag.
 </div>
 </div>
 
-<center>
-<h1>Pleroma</h1>
-</center>
+<div class="org-center">
+
+<div class="figure">
+<p><img src="images/pleroma-logo.png" alt="pleroma-logo.png" />
+</p>
+</div>
+</div>
 
 <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.
@@ -260,9 +264,9 @@ Pleroma is an OStatus-compatible social networking server, compatible with GNU S
 </div>
 </div>
 
-<div id="outline-container-org7600aa0" class="outline-2">
-<h2 id="org7600aa0">Installation</h2>
-<div class="outline-text-2" id="text-org7600aa0">
+<div id="outline-container-org630bbcf" class="outline-2">
+<h2 id="org630bbcf">Installation</h2>
+<div class="outline-text-2" id="text-org630bbcf">
 <p>
 Log into your system with:
 </p>
@@ -282,9 +286,9 @@ Select <b>Add/Remove Apps</b> then <b>pleroma</b>. You will then be asked for a
 </div>
 </div>
 
-<div id="outline-container-orgf115794" class="outline-2">
-<h2 id="orgf115794">Initial setup</h2>
-<div class="outline-text-2" id="text-orgf115794">
+<div id="outline-container-org703cfb4" class="outline-2">
+<h2 id="org703cfb4">Initial setup</h2>
+<div class="outline-text-2" id="text-org703cfb4">
 <p>
 The first thing you'll need to do is register a new account. You can set your profile details and profile image by selecting the small settings icon to the right of your name.
 </p>

website/EN/faq.html

@@ -3,10 +3,10 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2017-09-15 Fri 10:29 -->
+<!-- 2017-11-11 Sat 18:24 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
-<title></title>
+<title>&lrm;</title>
 <meta name="generator" content="Org mode" />
 <meta name="author" content="Bob Mottram" />
 <meta name="description" content="Frequently asked questions"
@@ -249,6 +249,13 @@ for the JavaScript code in this tag.
 </center>
 
 <div class="org-center">
+<p>
+<img src="images/surveillanceoptions.jpg" alt="surveillanceoptions.jpg" />
+<i>Possible options for dealing with bulk surveillance at The Glass Room exhibition, 2017</i>
+</p>
+</div>
+
+<div class="org-center">
 <table border="-1" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
 
 
@@ -257,39 +264,39 @@ for the JavaScript code in this tag.
 </colgroup>
 <tbody>
 <tr>
-<td class="org-left"><a href="#orgbbb3441">What applications are supported?</a></td>
+<td class="org-left"><a href="#orgf3ee5ce">What applications are supported?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgd634a7c">I don't have a static IP address. Can I still install this system?</a></td>
+<td class="org-left"><a href="#orgec76339">I don't have a static IP address. Can I still install this system?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org88331dc">Why Freedombone and not FreedomBox?</a></td>
+<td class="org-left"><a href="#org2da13bd">Why Freedombone and not FreedomBox?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgc55c3a9">Why not support building images for Raspberry Pi?</a></td>
+<td class="org-left"><a href="#orgd530659">Why not support building images for Raspberry Pi?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orga017b02">Why use Tor? I've heard it's used by bad people</a></td>
+<td class="org-left"><a href="#org4bb2842">Why use Tor? I've heard it's used by bad people</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org249c744">How is Tor integrated with Freedombone?</a></td>
+<td class="org-left"><a href="#org8f15beb">How is Tor integrated with Freedombone?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org7cecca6">Can I add a clearnet domain to an onion build?</a></td>
+<td class="org-left"><a href="#orgd33d165">Can I add a clearnet domain to an onion build?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org851c64e">Why use Github?</a></td>
+<td class="org-left"><a href="#org8e4a27d">Why use Github?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgf317597">Keys and emails should not be stored on servers. Why do you do that?</a></td>
+<td class="org-left"><a href="#org3cd5f2c">Keys and emails should not be stored on servers. Why do you do that?</a></td>
 </tr>
 
 <tr>
@@ -297,103 +304,103 @@ for the JavaScript code in this tag.
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org01f5e64">Why can't I access my .onion site with a Tor browser?</a></td>
+<td class="org-left"><a href="#org97f01de">Why can't I access my .onion site with a Tor browser?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org38cbf46">What is the best hardware to run this system on?</a></td>
+<td class="org-left"><a href="#org49504c7">What is the best hardware to run this system on?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgcce0278">Can I add more users to the system?</a></td>
+<td class="org-left"><a href="#orgf3e781c">Can I add more users to the system?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org101140b">Why not use Signal for mobile chat?</a></td>
+<td class="org-left"><a href="#orgb408729">Why not use Signal for mobile chat?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org8b50dde">What is the most secure chat app to use on mobile?</a></td>
+<td class="org-left"><a href="#orgd117b08">What is the most secure chat app to use on mobile?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org20eaffc">How do I remove a user from the system?</a></td>
+<td class="org-left"><a href="#orgb5b2126">How do I remove a user from the system?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org209f0d6">Why is logging for web sites turned off by default?</a></td>
+<td class="org-left"><a href="#org1ab944e">Why is logging for web sites turned off by default?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orga16e12a">How do I reset the tripwire?</a></td>
+<td class="org-left"><a href="#org576c1da">How do I reset the tripwire?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgf085eb1">Is metadata protected?</a></td>
+<td class="org-left"><a href="#org575438d">Is metadata protected?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org20694ec">How do I create email processing rules?</a></td>
+<td class="org-left"><a href="#org249cb8e">How do I create email processing rules?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgf194d33">Why isn't dynamic DNS working?</a></td>
+<td class="org-left"><a href="#org0026d12">Why isn't dynamic DNS working?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org04c8e6a">How do I change my encryption settings?</a></td>
+<td class="org-left"><a href="#orgcf9314c">How do I change my encryption settings?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org4756925">How do I get a domain name?</a></td>
+<td class="org-left"><a href="#org623845a">How do I get a domain name?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org0580486">How do I get a "real" SSL/TLS/HTTPS certificate?</a></td>
+<td class="org-left"><a href="#org80ee241">How do I get a "real" SSL/TLS/HTTPS certificate?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org689608f">How do I renew a Let's Encrypt certificate?</a></td>
+<td class="org-left"><a href="#org8b85e62">How do I renew a Let's Encrypt certificate?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org00c9fac">I tried to renew a Let's Encrypt certificate and it failed. What should I do?</a></td>
+<td class="org-left"><a href="#org6aba810">I tried to renew a Let's Encrypt certificate and it failed. What should I do?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org7f1159a">Why not use the services of $company instead? They took the Seppuku pledge</a></td>
+<td class="org-left"><a href="#orgc65717c">Why not use the services of $company instead? They took the Seppuku pledge</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org5459287">Why does my email keep getting rejected as spam by Gmail/etc?</a></td>
+<td class="org-left"><a href="#org76affcf">Why does my email keep getting rejected as spam by Gmail/etc?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org108fab6">Tor is censored/blocked in my area. What can I do?</a></td>
+<td class="org-left"><a href="#org93992f5">Tor is censored/blocked in my area. What can I do?</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgaeeac02">I want to block a particular domain from getting its content into my social network sites</a></td>
+<td class="org-left"><a href="#org92ebfd1">I want to block a particular domain from getting its content into my social network sites</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orgfefb387">The mesh system doesn't boot from USB drive</a></td>
+<td class="org-left"><a href="#orgd38ad08">The mesh system doesn't boot from USB drive</a></td>
 </tr>
 </tbody>
 </table>
 </div>
 
-<div id="outline-container-orgbbb3441" class="outline-2">
-<h2 id="orgbbb3441">What applications are supported?</h2>
-<div class="outline-text-2" id="text-orgbbb3441">
+<div id="outline-container-orgf3ee5ce" class="outline-2">
+<h2 id="orgf3ee5ce">What applications are supported?</h2>
+<div class="outline-text-2" id="text-orgf3ee5ce">
 <p>
 <a href="./apps.html">See here</a> for the complete list of apps. In addition to those as part of the base install you get an email server.
 </p>
 </div>
 </div>
-<div id="outline-container-orgd634a7c" class="outline-2">
-<h2 id="orgd634a7c">I don't have a static IP address. Can I still install this system?</h2>
-<div class="outline-text-2" id="text-orgd634a7c">
+<div id="outline-container-orgec76339" class="outline-2">
+<h2 id="orgec76339">I don't have a static IP address. Can I still install this system?</h2>
+<div class="outline-text-2" id="text-orgec76339">
 <p>
 Yes. The minimum requirements are to have some hardware that you can install Debian onto and also that you have administrator access to your internet router so that you can forward ports to the system which has Freedombone installed.
 </p>
@@ -403,17 +410,17 @@ The lack of a static IP address can be worked around by using a dynamic DNS serv
 </p>
 </div>
 </div>
-<div id="outline-container-org88331dc" class="outline-2">
-<h2 id="org88331dc">Why Freedombone and not FreedomBox?</h2>
-<div class="outline-text-2" id="text-org88331dc">
+<div id="outline-container-org2da13bd" class="outline-2">
+<h2 id="org2da13bd">Why Freedombone and not FreedomBox?</h2>
+<div class="outline-text-2" id="text-org2da13bd">
 <p>
 When the project began in late 2013 the FreedomBox project seemed to be going nowhere, and was only designed to work with the DreamPlug hardware. There was some new hardware out - the Beaglebone Black - which could run Debian and was also a free hardware design so seemed more appropriate. Hence the name "Freedombone", being like FreedomBox but on a Beaglebone. There are some similarities and differences between the two projects:
 </p>
 </div>
 
-<div id="outline-container-org2f730a6" class="outline-3">
-<h3 id="org2f730a6">Similarities</h3>
-<div class="outline-text-3" id="text-org2f730a6">
+<div id="outline-container-orgfb1ae01" class="outline-3">
+<h3 id="orgfb1ae01">Similarities</h3>
+<div class="outline-text-3" id="text-orgfb1ae01">
 <ul class="org-ul">
 <li>Uses freedom-maker and vmdebootstrap to build debian images</li>
 <li>Supports the use of Tor onion addresses to access websites</li>
@@ -427,9 +434,9 @@ When the project began in late 2013 the FreedomBox project seemed to be going no
 </ul>
 </div>
 </div>
-<div id="outline-container-org54e066a" class="outline-3">
-<h3 id="org54e066a">Differences</h3>
-<div class="outline-text-3" id="text-org54e066a">
+<div id="outline-container-orgea61850" class="outline-3">
+<h3 id="orgea61850">Differences</h3>
+<div class="outline-text-3" id="text-orgea61850">
 <ul class="org-ul">
 <li>FreedomBox is a Debian pure blend. Freedombone is not</li>
 <li>Freedombone only supports Free Software. FreedomBox includes some closed binary boot blobs for certain ARM boards</li>
@@ -444,9 +451,9 @@ When the project began in late 2013 the FreedomBox project seemed to be going no
 </div>
 </div>
 </div>
-<div id="outline-container-orgc55c3a9" class="outline-2">
-<h2 id="orgc55c3a9">Why not support building images for Raspberry Pi?</h2>
-<div class="outline-text-2" id="text-orgc55c3a9">
+<div id="outline-container-orgd530659" class="outline-2">
+<h2 id="orgd530659">Why not support building images for Raspberry Pi?</h2>
+<div class="outline-text-2" id="text-orgd530659">
 <p>
 The FreedomBox project supports Raspberry Pi builds, and the image build system for Freedombone is based on the same system. However, although the Raspberry Pi can run a version of Debian it requires a closed proprietary blob in order to boot the hardware. Who knows what that blob might contain or what exploits it could facilitate. From an adversarial point of view if you were trying to deliver "bulk equipment interference" then it doesn't get any better than piggybacking on something which has control of the boot process, and hence all subsequently run processes.
 </p>
@@ -456,9 +463,9 @@ So although the Raspberry Pi is cheap and hugely popular it's not supported by t
 </p>
 </div>
 </div>
-<div id="outline-container-orga017b02" class="outline-2">
-<h2 id="orga017b02">Why use Tor? I've heard it's used by bad people</h2>
-<div class="outline-text-2" id="text-orga017b02">
+<div id="outline-container-org4bb2842" class="outline-2">
+<h2 id="org4bb2842">Why use Tor? I've heard it's used by bad people</h2>
+<div class="outline-text-2" id="text-org4bb2842">
 <p>
 Before you run screaming for the hills based upon whatever scare story you may have just read in the mainstream media there are a few things worthy of consideration. Tor is installed by default on Freedombone, <i>but not as a relay or exit node</i>. It's only used to provide onion addresses so that this gives you or the viewers of your sites some choice about how they access the information. It also allows you to subscribe to and read RSS feeds privately.
 </p>
@@ -476,9 +483,9 @@ The media may also have sold you torrid tales about individual Tor project devel
 </p>
 </div>
 </div>
-<div id="outline-container-org249c744" class="outline-2">
-<h2 id="org249c744">How is Tor integrated with Freedombone?</h2>
-<div class="outline-text-2" id="text-org249c744">
+<div id="outline-container-org8f15beb" class="outline-2">
+<h2 id="org8f15beb">How is Tor integrated with Freedombone?</h2>
+<div class="outline-text-2" id="text-org8f15beb">
 <p>
 Within this project Tor is used more to provide <i>accessibility</i> than the <i>anonymity</i> factor for which Tor is better known. The onion address system provides a way of being able to access sites even if you don't own a conventional domain name or don't have administrator access to your local internet router to be able to do port forwarding.
 </p>
@@ -496,17 +503,17 @@ Even if you're running the "onion only" build, this only means that sites are ac
 </p>
 </div>
 </div>
-<div id="outline-container-org7cecca6" class="outline-2">
-<h2 id="org7cecca6">Can I add a clearnet domain to an onion build?</h2>
-<div class="outline-text-2" id="text-org7cecca6">
+<div id="outline-container-orgd33d165" class="outline-2">
+<h2 id="orgd33d165">Can I add a clearnet domain to an onion build?</h2>
+<div class="outline-text-2" id="text-orgd33d165">
 <p>
 You could if you manually edited the relevant nginx configuration files and installed some dynamic DNS system yourself. If you already have sysadmin knowledge then that's probably not too hard. But the builds created with the <b>onion-addresses-only</b> option aren't really intended to support access via clearnet domains.
 </p>
 </div>
 </div>
-<div id="outline-container-org851c64e" class="outline-2">
-<h2 id="org851c64e">Why use Github?</h2>
-<div class="outline-text-2" id="text-org851c64e">
+<div id="outline-container-org8e4a27d" class="outline-2">
+<h2 id="org8e4a27d">Why use Github?</h2>
+<div class="outline-text-2" id="text-org8e4a27d">
 <p>
 Github is paradoxically a centralized, closed and proprietary system which happens to mostly host free and open source projects. Up until now it has been relatively benign, but at some point in the name of "growth" it will likely start becoming more evil, or just become like SourceForge - which was also once much loved by FOSS developers, but turned into a den of malvertizing.
 </p>
@@ -524,9 +531,9 @@ Currently many of the repositories used for applications which are not yet packa
 </p>
 </div>
 </div>
-<div id="outline-container-orgf317597" class="outline-2">
-<h2 id="orgf317597">Keys and emails should not be stored on servers. Why do you do that?</h2>
-<div class="outline-text-2" id="text-orgf317597">
+<div id="outline-container-org3cd5f2c" class="outline-2">
+<h2 id="org3cd5f2c">Keys and emails should not be stored on servers. Why do you do that?</h2>
+<div class="outline-text-2" id="text-org3cd5f2c">
 <p>
 Ordinarily this is good advice. However, the threat model for a device in your home is different from the one for a generic server in a massive warehouse. Compare and contrast:
 </p>
@@ -584,9 +591,9 @@ In the home environment a box with a good firewall and no GUI components install
 </div>
 </div>
 
-<div id="outline-container-org01f5e64" class="outline-2">
-<h2 id="org01f5e64">Why can't I access my .onion site with a Tor browser?</h2>
-<div class="outline-text-2" id="text-org01f5e64">
+<div id="outline-container-org97f01de" class="outline-2">
+<h2 id="org97f01de">Why can't I access my .onion site with a Tor browser?</h2>
+<div class="outline-text-2" id="text-org97f01de">
 <p>
 Probably you need to add the site to the NoScript whitelist. Typically click/press on the noscript icon (or select from the menu on mobile) then select <i>whitelist</i> and add the site URL. You may also need to disable HTTPS Everywhere when using onion addresses, which don't use https.
 </p>
@@ -596,9 +603,9 @@ Another factor to be aware of is that it can take a while for the onion address
 </p>
 </div>
 </div>
-<div id="outline-container-org38cbf46" class="outline-2">
-<h2 id="org38cbf46">What is the best hardware to run this system on?</h2>
-<div class="outline-text-2" id="text-org38cbf46">
+<div id="outline-container-org49504c7" class="outline-2">
+<h2 id="org49504c7">What is the best hardware to run this system on?</h2>
+<div class="outline-text-2" id="text-org49504c7">
 <p>
 It was originally designed to run on the Beaglebone Black, but that should be regarded as the most minimal system, because it's single core and has by today's standards a small amount of memory. Obviously the more powerful the hardware is the faster things like web pages (blog, social networking, etc) will be served but the more electricity such a system will require if you're running it 24/7. A good compromise between performance and energy consumption is something like an old netbook. The battery of an old netbook or laptop even gives you <a href="https://en.wikipedia.org/wiki/Uninterruptible_power_supply">UPS capability</a> to keep the system going during brief power outages or cable re-arrangements, and that means using full disk encryption on the server also becomes more practical.
 </p>
@@ -608,16 +615,16 @@ It was originally designed to run on the Beaglebone Black, but that should be re
 </p>
 </div>
 </div>
-<div id="outline-container-orgcce0278" class="outline-2">
-<h2 id="orgcce0278">Can I add more users to the system?</h2>
-<div class="outline-text-2" id="text-orgcce0278">
+<div id="outline-container-orgf3e781c" class="outline-2">
+<h2 id="orgf3e781c">Can I add more users to the system?</h2>
+<div class="outline-text-2" id="text-orgf3e781c">
 <p>
 Yes. Freedombone can support a small number of users, for a "<i>friends and family</i>" type of home installation. This gives them access to an email account, XMPP, SIP phone and the blog (depending on whether the variant which you installed includes those).
 </p>
 
 <div class="org-src-container">
-<pre><code class="src src-bash">ssh username@mydomainname -p 2222
-</code></pre>
+<pre class="src src-bash">ssh username@mydomainname -p 2222
+</pre>
 </div>
 
 <p>
@@ -633,9 +640,9 @@ Another point is that Freedombone installations are not intended to support many
 </p>
 </div>
 </div>
-<div id="outline-container-org101140b" class="outline-2">
-<h2 id="org101140b">Why not use Signal for mobile chat?</h2>
-<div class="outline-text-2" id="text-org101140b">
+<div id="outline-container-orgb408729" class="outline-2">
+<h2 id="orgb408729">Why not use Signal for mobile chat?</h2>
+<div class="outline-text-2" id="text-orgb408729">
 <p>
 Celebrities recommend Signal. It's Free Software so it must be good, right?
 </p>
@@ -658,9 +665,9 @@ To give credit where it's due Signal is good, but it could be a lot better. The
 </p>
 </div>
 </div>
-<div id="outline-container-org8b50dde" class="outline-2">
-<h2 id="org8b50dde">What is the most secure chat app to use on mobile?</h2>
-<div class="outline-text-2" id="text-org8b50dde">
+<div id="outline-container-orgd117b08" class="outline-2">
+<h2 id="orgd117b08">What is the most secure chat app to use on mobile?</h2>
+<div class="outline-text-2" id="text-orgd117b08">
 <p>
 On mobile there are various options. The apps which are likely to be most secure are ones which have end-to-end encryption enabled by default and which can also be onion routed via Orbot. End-to-end encryption secures the content of the message and onion routing obscures the metadata, making it hard for a passive adversary to know who is communicating with who.
 </p>
@@ -670,20 +677,20 @@ The current safest way to chat is to use <a href="https://conversations.im">Conv
 </p>
 
 <p>
-There are many <a href="#org101140b">other fashionable chat apps</a> with end-to-end security, but often they are closed source, have a single central server or can't be onion routed. It's also important to remember that closed source chat apps should be assumed to be untrustworthy, since their security cannot be independently verified.
+There are many <a href="#orgb408729">other fashionable chat apps</a> with end-to-end security, but often they are closed source, have a single central server or can't be onion routed. It's also important to remember that closed source chat apps should be assumed to be untrustworthy, since their security cannot be independently verified.
 </p>
 </div>
 </div>
-<div id="outline-container-org20eaffc" class="outline-2">
-<h2 id="org20eaffc">How do I remove a user from the system?</h2>
-<div class="outline-text-2" id="text-org20eaffc">
+<div id="outline-container-orgb5b2126" class="outline-2">
+<h2 id="orgb5b2126">How do I remove a user from the system?</h2>
+<div class="outline-text-2" id="text-orgb5b2126">
 <p>
 To remove a user:
 </p>
 
 <div class="org-src-container">
-<pre><code class="src src-bash">ssh username@mydomainname -p 2222
-</code></pre>
+<pre class="src src-bash">ssh username@mydomainname -p 2222
+</pre>
 </div>
 
 <p>
@@ -691,9 +698,9 @@ Select <i>Administrator controls</i> then <i>Manage Users</i> and then <i>Delete
 </p>
 </div>
 </div>
-<div id="outline-container-org209f0d6" class="outline-2">
-<h2 id="org209f0d6">Why is logging for web sites turned off by default?</h2>
-<div class="outline-text-2" id="text-org209f0d6">
+<div id="outline-container-org1ab944e" class="outline-2">
+<h2 id="org1ab944e">Why is logging for web sites turned off by default?</h2>
+<div class="outline-text-2" id="text-org1ab944e">
 <p>
 If you're making profits out of the logs by running large server warehouses and then data mining what users click on - as is the business model of well known internet companies - then logging everything makes total sense. However, if you're running a home server then logging really only makes sense if you're trying to diagnose some specific problem with the system, and outside of that context logging everything becomes more of a liability than an asset.
 </p>
@@ -707,16 +714,16 @@ On the Freedombone system web logs containing IP addresses are turned off by def
 </p>
 </div>
 </div>
-<div id="outline-container-orga16e12a" class="outline-2">
-<h2 id="orga16e12a">How do I reset the tripwire?</h2>
-<div class="outline-text-2" id="text-orga16e12a">
+<div id="outline-container-org576c1da" class="outline-2">
+<h2 id="org576c1da">How do I reset the tripwire?</h2>
+<div class="outline-text-2" id="text-org576c1da">
 <p>
 The tripwire will be automatically reset once per week. If you want to reset it earlier then do the following:
 </p>
 
 <div class="org-src-container">
-<pre><code class="src src-bash">ssh username@mydomain -p 2222
-</code></pre>
+<pre class="src src-bash">ssh username@mydomain -p 2222
+</pre>
 </div>
 
 <p>
@@ -724,9 +731,9 @@ Select <i>Administrator controls</i> then "reset tripwire" using cursors and spa
 </p>
 </div>
 </div>
-<div id="outline-container-orgf085eb1" class="outline-2">
-<h2 id="orgf085eb1">Is metadata protected?</h2>
-<div class="outline-text-2" id="text-orgf085eb1">
+<div id="outline-container-org575438d" class="outline-2">
+<h2 id="org575438d">Is metadata protected?</h2>
+<div class="outline-text-2" id="text-org575438d">
 <blockquote>
 <p>
 "<i>We kill people based on metadata</i>"
@@ -742,12 +749,12 @@ Even when using Freedombone metadata analysis by third parties is still possible
 </p>
 </div>
 </div>
-<div id="outline-container-org20694ec" class="outline-2">
-<h2 id="org20694ec">How do I create email processing rules?</h2>
-<div class="outline-text-2" id="text-org20694ec">
+<div id="outline-container-org249cb8e" class="outline-2">
+<h2 id="org249cb8e">How do I create email processing rules?</h2>
+<div class="outline-text-2" id="text-org249cb8e">
 <div class="org-src-container">
-<pre><code class="src src-bash">ssh username@domainname -p 2222
-</code></pre>
+<pre class="src src-bash">ssh username@domainname -p 2222
+</pre>
 </div>
 
 <p>
@@ -800,16 +807,16 @@ Spamassassin is also available and within Mutt you can use the S (shift+s) key t
 </p>
 </div>
 </div>
-<div id="outline-container-orgf194d33" class="outline-2">
-<h2 id="orgf194d33">Why isn't dynamic DNS working?</h2>
-<div class="outline-text-2" id="text-orgf194d33">
+<div id="outline-container-org0026d12" class="outline-2">
+<h2 id="org0026d12">Why isn't dynamic DNS working?</h2>
+<div class="outline-text-2" id="text-org0026d12">
 <p>
 If you run the command:
 </p>
 
 <div class="org-src-container">
-<pre><code class="src src-bash">systemctl status inadyn
-</code></pre>
+<pre class="src src-bash">systemctl status inadyn
+</pre>
 </div>
 
 <p>
@@ -817,24 +824,24 @@ And see some error related to checking for changes in the IP address then you ca
 </p>
 
 <div class="org-src-container">
-<pre><code class="src src-text">https://check.torproject.org/
+<pre class="src src-text">https://check.torproject.org/
 https://www.whatsmydns.net/whats-my-ip-address.html
 https://www.privateinternetaccess.com/pages/whats-my-ip/
-</code></pre>
+</pre>
 </div>
 </div>
 </div>
 
-<div id="outline-container-org04c8e6a" class="outline-2">
-<h2 id="org04c8e6a">How do I change my encryption settings?</h2>
-<div class="outline-text-2" id="text-org04c8e6a">
+<div id="outline-container-orgcf9314c" class="outline-2">
+<h2 id="orgcf9314c">How do I change my encryption settings?</h2>
+<div class="outline-text-2" id="text-orgcf9314c">
 <p>
 Suppose that some new encryption vulnerability has been announced and that you need to change your encryption settings. Maybe an algorithm thought to be secure is now no longer so and you need to remove it. You can change your settings by doing the following:
 </p>
 
 <div class="org-src-container">
-<pre><code class="src src-bash">ssh myusername@mydomain -p 2222
-</code></pre>
+<pre class="src src-bash">ssh myusername@mydomain -p 2222
+</pre>
 </div>
 
 <p>
@@ -842,9 +849,9 @@ Select <i>Administrator controls</i> then select <i>Security Settings</i>. You w
 </p>
 </div>
 </div>
-<div id="outline-container-org4756925" class="outline-2">
-<h2 id="org4756925">How do I get a domain name?</h2>
-<div class="outline-text-2" id="text-org4756925">
+<div id="outline-container-org623845a" class="outline-2">
+<h2 id="org623845a">How do I get a domain name?</h2>
+<div class="outline-text-2" id="text-org623845a">
 <p>
 Suppose that you have bought a domain name (rather than using a free subdomain on freedns) and you want to use that instead.
 </p>
@@ -854,11 +861,11 @@ Remove any existing nameservers for your domain (or select "custom" nameservers)
 </p>
 
 <div class="org-src-container">
-<pre><code class="src src-text">NS1.AFRAID.ORG
+<pre class="src src-text">NS1.AFRAID.ORG
 NS2.AFRAID.ORG
 NS3.AFRAID.ORG
 NS4.AFRAID.ORG
-</code></pre>
+</pre>
 </div>
 
 <p>
@@ -874,8 +881,8 @@ To route email to one of your freedns domains:
 </p>
 
 <div class="org-src-container">
-<pre><code class="src src-bash">editor /etc/mailname
-</code></pre>
+<pre class="src src-bash">editor /etc/mailname
+</pre>
 </div>
 
 <p>
@@ -883,8 +890,8 @@ Add any extra domains which you own, then save and exit.
 </p>
 
 <div class="org-src-container">
-<pre><code class="src src-bash">editor /etc/exim4/update-exim4.conf.conf
-</code></pre>
+<pre class="src src-bash">editor /etc/exim4/update-exim4.conf.conf
+</pre>
 </div>
 
 <p>
@@ -896,10 +903,10 @@ Save and exit, then restart exim.
 </p>
 
 <div class="org-src-container">
-<pre><code class="src src-bash">update-exim4.conf.template -r
+<pre class="src src-bash">update-exim4.conf.template -r
 update-exim4.conf
 service exim4 restart
-</code></pre>
+</pre>
 </div>
 
 <p>
@@ -908,16 +915,16 @@ You should now be able to send an email from <i>postmaster@mynewdomainname</i> a
 </div>
 </div>
 
-<div id="outline-container-org0580486" class="outline-2">
-<h2 id="org0580486">How do I get a "real" SSL/TLS/HTTPS certificate?</h2>
-<div class="outline-text-2" id="text-org0580486">
+<div id="outline-container-org80ee241" class="outline-2">
+<h2 id="org80ee241">How do I get a "real" SSL/TLS/HTTPS certificate?</h2>
+<div class="outline-text-2" id="text-org80ee241">
 <p>
 If you did the full install or selected the social variant then the system will have tried to obtain a Let's Encrypt certificate automatically during the install process. If this failed for any reason, or if you have created a new site which you need a certificate for then do the following:
 </p>
 
 <div class="org-src-container">
-<pre><code class="src src-bash">ssh username@mydomainname -p 2222
-</code></pre>
+<pre class="src src-bash">ssh username@mydomainname -p 2222
+</pre>
 </div>
 
 <p>
@@ -929,9 +936,9 @@ One thing to be aware of is that Let's Encrypt doesn't support many dynamic DNS
 </p>
 </div>
 </div>
-<div id="outline-container-org689608f" class="outline-2">
-<h2 id="org689608f">How do I renew a Let's Encrypt certificate?</h2>
-<div class="outline-text-2" id="text-org689608f">
+<div id="outline-container-org8b85e62" class="outline-2">
+<h2 id="org8b85e62">How do I renew a Let's Encrypt certificate?</h2>
+<div class="outline-text-2" id="text-org8b85e62">
 <p>
 Normally certificates will be automatically renewed once per month, so you don't need to be concerned about it. If anything goes wrong with the automatic renewal then you should receive a warning email.
 </p>
@@ -941,8 +948,8 @@ If you need to manually renew a certificate:
 </p>
 
 <div class="org-src-container">
-<pre><code class="src src-bash">ssh username@mydomainname -p 2222
-</code></pre>
+<pre class="src src-bash">ssh username@mydomainname -p 2222
+</pre>
 </div>
 
 <p>
@@ -950,16 +957,16 @@ Select <i>Administrator controls</i> then <b>Security settings</b> then <b>Renew
 </p>
 </div>
 </div>
-<div id="outline-container-org00c9fac" class="outline-2">
-<h2 id="org00c9fac">I tried to renew a Let's Encrypt certificate and it failed. What should I do?</h2>
-<div class="outline-text-2" id="text-org00c9fac">
+<div id="outline-container-org6aba810" class="outline-2">
+<h2 id="org6aba810">I tried to renew a Let's Encrypt certificate and it failed. What should I do?</h2>
+<div class="outline-text-2" id="text-org6aba810">
 <p>
 Most likely it's because Let's Encrypt doesn't support your particular domain or subdomain. Currently free subdomains tend not to work. You'll need to buy a domain name, link it to your dynamic DNS account and then do:
 </p>
 
 <div class="org-src-container">
-<pre><code class="src src-bash">ssh username@mydomainname -p 2222
-</code></pre>
+<pre class="src src-bash">ssh username@mydomainname -p 2222
+</pre>
 </div>
 
 <p>
@@ -967,17 +974,17 @@ Select <i>Administrator controls</i> then <b>Security settings</b> then <b>Creat
 </p>
 </div>
 </div>
-<div id="outline-container-org7f1159a" class="outline-2">
-<h2 id="org7f1159a">Why not use the services of $company instead? They took the Seppuku pledge</h2>
-<div class="outline-text-2" id="text-org7f1159a">
+<div id="outline-container-orgc65717c" class="outline-2">
+<h2 id="orgc65717c">Why not use the services of $company instead? They took the Seppuku pledge</h2>
+<div class="outline-text-2" id="text-orgc65717c">
 <p>
 <a href="https://cryptostorm.org/viewtopic.php?f=63&amp;t=2954&amp;sid=7de2d1e699cfde2f574e6a7f6ea5a173">That pledge</a> is utterly worthless. Years ago people trusted Google in the same sort of way, because they promised not be be evil and because a lot of the engineers working for them seemed like honest types who were "<i>on our side</i>". Post-<a href="https://en.wikipedia.org/wiki/Nymwars">nymwars</a> and post-<a href="https://en.wikipedia.org/wiki/PRISM_(surveillance_program)">PRISM</a> we know exactly how much Google cared about the privacy and security of its users. But Google is only one particular example. In general don't trust pledges made by companies, even if the people running them seem really sincere.
 </p>
 </div>
 </div>
-<div id="outline-container-org5459287" class="outline-2">
-<h2 id="org5459287">Why does my email keep getting rejected as spam by Gmail/etc?</h2>
-<div class="outline-text-2" id="text-org5459287">
+<div id="outline-container-org76affcf" class="outline-2">
+<h2 id="org76affcf">Why does my email keep getting rejected as spam by Gmail/etc?</h2>
+<div class="outline-text-2" id="text-org76affcf">
 <p>
 Welcome to the world of email. Email is really the archetypal decentralized service, developed during the early days of the internet. In principle anyone can run an email server, and that's exactly what you're doing with Freedombone. Email is very useful, but it has a big problem, and that's that the protocols are totally insecure. That made it easy for spammers to do their thing, and in response highly elaborate spam filtering and blocking systems were developed. Chances are that your emails are being blocked in this way. Sometimes the blocking is so indisciminate that entire countries are excluded. What can you do about it? Unless you control the block list at the receiving end you may not be able to do much unless you can find an email proxy server which is trusted by the receiving server.
 </p>
@@ -987,8 +994,8 @@ Often ISPs will run their own SMTP mail server which you can use for proxying, t
 </p>
 
 <div class="org-src-container">
-<pre><code class="src src-bash">ssh username@mydomainname -p 2222
-</code></pre>
+<pre class="src src-bash">ssh username@mydomainname -p 2222
+</pre>
 </div>
 
 <p>
@@ -1008,9 +1015,9 @@ So the situation with email presently is pretty bad, and there's a clear selecti
 </p>
 </div>
 </div>
-<div id="outline-container-org108fab6" class="outline-2">
-<h2 id="org108fab6">Tor is censored/blocked in my area. What can I do?</h2>
-<div class="outline-text-2" id="text-org108fab6">
+<div id="outline-container-org93992f5" class="outline-2">
+<h2 id="org93992f5">Tor is censored/blocked in my area. What can I do?</h2>
+<div class="outline-text-2" id="text-org93992f5">
 <p>
 If you can find some details for an obfs4 Tor bridge (its IP address, port number and key or nickname) then you can set up the system to use it to connect to the Tor network. Unlike relay nodes the IP addresses for bridges are not public information and so can't be easily known and added to block lists by authoritarian regimes or over-zealous ISPs.
 </p>
@@ -1041,9 +1048,9 @@ Return to the <a href="index.html">home page</a>
 </div>
 </div>
 
-<div id="outline-container-orgaeeac02" class="outline-2">
-<h2 id="orgaeeac02">I want to block a particular domain from getting its content into my social network sites</h2>
-<div class="outline-text-2" id="text-orgaeeac02">
+<div id="outline-container-org92ebfd1" class="outline-2">
+<h2 id="org92ebfd1">I want to block a particular domain from getting its content into my social network sites</h2>
+<div class="outline-text-2" id="text-org92ebfd1">
 <p>
 If you're being pestered by some domain which contains bad/illegal/harrassing content or irritating users you can block domains at the firewall level. Go to the administrator control panel and select <i>domain blocking</i>. You can then block, unblock and view the list of blocked domains.
 </p>
@@ -1058,9 +1065,9 @@ Select <i>Administrator controls</i> then <i>Domain blocking</i>.
 </div>
 </div>
 
-<div id="outline-container-orgfefb387" class="outline-2">
-<h2 id="orgfefb387">The mesh system doesn't boot from USB drive</h2>
-<div class="outline-text-2" id="text-orgfefb387">
+<div id="outline-container-orgd38ad08" class="outline-2">
+<h2 id="orgd38ad08">The mesh system doesn't boot from USB drive</h2>
+<div class="outline-text-2" id="text-orgd38ad08">
 <p>
 If the system doesn't boot and reports an error which includes <b>/dev/mapper/loop0p1</b> then reboot with <b>Ctrl-Alt-Del</b> and when you see the grub menu press <b>e</b> and manually change <b>/dev/mapper/loop0p1</b> to <b>/dev/sdb1</b>, then press <b>Ctrl-x</b>. If that doesn't work then reboot and try <b>/dev/sdc1</b> instead.
 </p>