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

doc/EN/app_xmpp.org

 #+END_SRC
 
 Then select *Next*. When chatting you can use the lock icon to encrypt your conversation. OMEMO is the recommended type of encryption. It's also going through Tor, so passive surveillance of the metadata should not be easy for an adversary.
+
+It's also recommended to disable battery optimisations for Conversations and Orbot. If you don't do that then you may have trouble receiving messages or some parts of the protocol may break. That can be done by going to *Settings*, selecting *Battery* then opening the menu (top right) and selecting *Battery optimisations* then selecting *Not optimised* and *All apps*, then finally choosing Conversations and Orbot not to be optimised.

doc/EN/mobile.org

     <td><center><b><h3>Services</h3></b><br>Connect to the Freedombone services</center></td>
   </tr>
   <tr>
-    <td><center><b><h3>Battery</h3></b><br>Avoid battery-eating apps</center></td>
+    <td><center><b><h3>Battery</h3></b><br>Avoid battery-eating apps and disable some optimisations</center></td>
     <td><center><b><h3>Block</h3></b><br>Prevent access to know bad domains</center></td>
   </tr>
 </table>
 * Services
 For information on configuring various apps to work with Freedombone see the [[file:./usage.html][usage section]]. Also see advice on chat apps in the [[file:./faq.html][FAQ]].
 
-* Battery preservation
+* Battery
 Even with free software apps it's not difficult to get into a situation where your battery doesn't last for long. To maximize battery life access RSS feeds via the onion-based mobile reader within a Tor-compatible browser and not from a locally installed RSS app.
 
 If you have Syncthing installed then change the settings so that it only syncs when charging and when on wifi. Avoid any apps which might be continuously polling and preventing the device from going into sleep mode when it's not used.
 
 If you're using the Riot mobile app to access a Matrix homeserver then you can significantly improve battery performance by going to the settings and changing *Sync request timeout* to 30 seconds and *Delay between two sync requests* to 600 seconds.
 
+It's also recommended to disable battery optimisations for Conversations and Orbot. If you don't do that then you may have trouble receiving messages or some parts of the protocol may break. That can be done by going to *Settings*, selecting *Battery* then opening the menu (top right) and selecting *Battery optimisations* then selecting *Not optimised* and *All apps*, then finally choosing Conversations and Orbot not to be optimised.
+
 * Blocking bad domains
 You can block known bad domains by editing the */system/etc/hosts* file on your device. It is possible to use extensive ad-blocking hosts files used by other ad-blocking systems such as pi-hole, but merely blocking Facebook and Google Analytics will protect you against much of the corporate surveillance which goes on. Even if you don't have a Facebook account this may still be useful since they will still try to create a "ghost profile" of you, so the less data they have the better.
 

src/freedombone-app-pleroma

 PLEROMA_PORT=4000
 PLEROMA_ONION_PORT=8011
 PLEROMA_REPO="https://git.pleroma.social/pleroma/pleroma.git"
-PLEROMA_COMMIT='460062f2b04220ffcd8f20aa842cc95582d1f849'
+PLEROMA_COMMIT='b0d242cd9220c22c0af7c153182a51d8e40d34ba'
 PLEROMA_ADMIN_PASSWORD=
 PLEROMA_DIR=/etc/pleroma
 PLEROMA_SECRET_KEY=""
 
     # migrate database
     sudo -u pleroma mix deps.clean --build mime
+    sudo -u pleroma mix ecto.migrate
 
     expire_pleroma_posts "$PLEROMA_DOMAIN_NAME" "$PLEROMA_EXPIRE_MONTHS"
     create_pleroma_blocklist
           echo '  location / {'; } >> "$pleroma_nginx_site"
         function_check nginx_limits
         nginx_limits "$PLEROMA_DOMAIN_NAME" '15m'
-        { echo '    proxy_http_version 1.1;';
+        { echo "    add_header 'Access-Control-Allow-Origin' '*';";
+          echo '    proxy_http_version 1.1;';
           echo "    proxy_set_header Upgrade \$http_upgrade;";
           echo '    proxy_set_header Connection "upgrade";';
+          echo "    proxy_set_header Host \$http_host;";
+          echo '';
           echo "    proxy_pass http://localhost:$PLEROMA_PORT;";
           echo '  }';
           echo '';
       echo '  location / {'; } >> "$pleroma_nginx_site"
     function_check nginx_limits
     nginx_limits "$PLEROMA_DOMAIN_NAME" '15m'
-    { echo '      proxy_http_version 1.1;';
+    { echo "      add_header 'Access-Control-Allow-Origin' '*';";
+      echo '      proxy_http_version 1.1;';
       echo "      proxy_set_header Upgrade \$http_upgrade;";
       echo '      proxy_set_header Connection "upgrade";';
+      echo "      proxy_set_header Host \$http_host;";
+      echo '';
       echo "      proxy_pass http://localhost:$PLEROMA_PORT;";
       echo '  }';
       echo '';

website/EN/app_xmpp.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-05-16 Tue 21:11 -->
+<!-- 2018-03-09 Fri 10:18 -->
 <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="How to use XMPP/Jabber"
 A well written article on the state of XMPP and how it compares to other chat protocols <a href="https://gultsch.de/xmpp_2016.html">can be found here</a>.
 </p>
 
-<div id="outline-container-orgf44a6c4" class="outline-2">
-<h2 id="orgf44a6c4">Using with Profanity</h2>
-<div class="outline-text-2" id="text-orgf44a6c4">
+<div id="outline-container-org7bb386c" class="outline-2">
+<h2 id="org7bb386c">Using with Profanity</h2>
+<div class="outline-text-2" id="text-org7bb386c">
 <p>
 You can install the <a href="./app_profanity.html">profanity app</a> via <b>Add/remove apps</b> on the <b>Administrator control panel</b>. Logging in and then selecting <b>Run App</b> and <b>profanity</b> will start it.
 </p>
 </div>
 </div>
-<div id="outline-container-org5033aae" class="outline-2">
-<h2 id="org5033aae">Using with Gajim</h2>
-<div class="outline-text-2" id="text-org5033aae">
+<div id="outline-container-org0cacfbd" class="outline-2">
+<h2 id="org0cacfbd">Using with Gajim</h2>
+<div class="outline-text-2" id="text-org0cacfbd">
 <p>
 In mid 2016 <a href="https://gajim.org/">Gajim</a> became the first desktop XMPP client to support the <a href="https://en.wikipedia.org/wiki/OMEMO">OMEMO end-to-end security standard</a>, which is superior to the more traditional <a href="https://en.wikipedia.org/wiki/Off-the-Record_Messaging">OTR</a> since it also includes multi-user chat and the ratcheting mechanism pioneered by Open Whisper Systems. To install it:
 </p>
 
 <div class="org-src-container">
-<pre><code class="src src-bash">su -c <span class="org-string">'echo "deb ftp://ftp.gajim.org/debian unstable main" &gt; /etc/apt/sources.list.d/gajim.list'</span>
+<pre class="src src-bash">su -c <span class="org-string">'echo "deb ftp://ftp.gajim.org/debian unstable main" &gt; /etc/apt/sources.list.d/gajim.list'</span>
 sudo apt-get update
 sudo apt-get -y install gajim-dev-keyring
 sudo apt-get -y install git tor python-dev python-pip gajim-nightly
 <span class="org-builtin">cd</span> ~/.local/share/gajim/plugins
 git clone https://github.com/omemo/gajim-omemo
 sudo pip install <span class="org-variable-name">protobuf</span>==2.6.1, python-axolotl==0.1.35
-</code></pre>
+</pre>
 </div>
 
 <p>
 </p>
 
 <div class="org-src-container">
-<pre><code class="src src-bash">~/.local/share/gajim
-</code></pre>
+<pre class="src src-bash">~/.local/share/gajim
+</pre>
 </div>
 
 <p>
 </div>
 </div>
 
-<div id="outline-container-orga1b2804" class="outline-2">
-<h2 id="orga1b2804">Using with Jitsi</h2>
-<div class="outline-text-2" id="text-orga1b2804">
+<div id="outline-container-orge89bc68" class="outline-2">
+<h2 id="orge89bc68">Using with Jitsi</h2>
+<div class="outline-text-2" id="text-orge89bc68">
 <p>
 Jitsi can be downloaded from <a href="https://jitsi.org">https://jitsi.org</a>
 </p>
 </div>
 </div>
 
-<div id="outline-container-org9e45966" class="outline-2">
-<h2 id="org9e45966">Using with Ubuntu</h2>
-<div class="outline-text-2" id="text-org9e45966">
+<div id="outline-container-orgaa23fee" class="outline-2">
+<h2 id="orgaa23fee">Using with Ubuntu</h2>
+<div class="outline-text-2" id="text-orgaa23fee">
 <p>
 The default XMPP client in Ubuntu is Empathy.  Using Empathy isn't as secure as using Jitsi, since it doesn't include the <i>off the record</i> feature, but since it's the default it's what many users will have easy access to.
 </p>
 </div>
 </div>
 
-<div id="outline-container-orgebb228c" class="outline-2">
-<h2 id="orgebb228c">Using Tor Messenger</h2>
-<div class="outline-text-2" id="text-orgebb228c">
+<div id="outline-container-org054a52c" class="outline-2">
+<h2 id="org054a52c">Using Tor Messenger</h2>
+<div class="outline-text-2" id="text-org054a52c">
 <p>
 Tor Messenger is a messaging client which supports XMPP, and its onion routing enables you to protect the metadata of chat interactions to some extent by making it difficult for an adversary to know which server is talking to which. You can download Tor Messenger from <a href="https://torproject.org">torproject.org</a> and the setup is pretty simple.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org1a2d0c5" class="outline-2">
-<h2 id="org1a2d0c5">Using with Android/Conversations</h2>
-<div class="outline-text-2" id="text-org1a2d0c5">
+<div id="outline-container-orgd6e9951" class="outline-2">
+<h2 id="orgd6e9951">Using with Android/Conversations</h2>
+<div class="outline-text-2" id="text-orgd6e9951">
 <p>
 Install <a href="https://f-droid.org/">F-Droid</a>
 </p>
 </p>
 
 <div class="org-src-container">
-<pre><code class="src src-bash">Jabber ID: myusername@mydomain
+<pre class="src src-bash">Jabber ID: myusername@mydomain
 Password:  your XMPP password
 Hostname:  mydomain (preferably your xmpp onion address)
 Port:      5222
-</code></pre>
+</pre>
 </div>
 
 <p>
 Then select <b>Next</b>. When chatting you can use the lock icon to encrypt your conversation. OMEMO is the recommended type of encryption. It's also going through Tor, so passive surveillance of the metadata should not be easy for an adversary.
 </p>
+
+<p>
+It's also recommended to disable battery optimisations for Conversations and Orbot. If you don't do that then you may have trouble receiving messages or some parts of the protocol may break. That can be done by going to <b>Settings</b>, selecting <b>Battery</b> then opening the menu (top right) and selecting <b>Battery optimisations</b> then selecting <b>Not optimised</b> and <b>All apps</b>, then finally choosing Conversations and Orbot not to be optimised.
+</p>
 </div>
 </div>
 </div>

website/EN/mobile.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 14:32 -->
+<!-- 2018-03-09 Fri 10:21 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>&lrm;</title>
     <td><center><b><h3>Services</h3></b><br>Connect to the Freedombone services</center></td>
   </tr>
   <tr>
-    <td><center><b><h3>Battery</h3></b><br>Avoid battery-eating apps</center></td>
+    <td><center><b><h3>Battery</h3></b><br>Avoid battery-eating apps and disable some optimisations</center></td>
     <td><center><b><h3>Block</h3></b><br>Prevent access to know bad domains</center></td>
   </tr>
 </table>
 </center>
 
-<div id="outline-container-orgd7b8f2c" class="outline-2">
-<h2 id="orgd7b8f2c">Open</h2>
-<div class="outline-text-2" id="text-orgd7b8f2c">
+<div id="outline-container-orgd2ad011" class="outline-2">
+<h2 id="orgd2ad011">Open</h2>
+<div class="outline-text-2" id="text-orgd2ad011">
 <p>
 Use a Linux based phone operating system. Typically this will mean Android, but could also mean LineageOS or Replicant. LineageOS is the most preferable, because you can usually get an up to date image with a recent kernel which will give you better security against exploits. If you're buying a phone then look for a model which is supported by LineageOS. Replicant is the most free (as in freedom) but only runs on a small number of phone models. If you have a phone which runs a full GNU/Linux system then that's fantastic, and you can probably use it in much the same way as a desktop system and the rest of the advice on this page won't apply. If you don't have a phone capable of running a Linux based operating system then consider selling, giving away or bartering your existing one.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org050f512" class="outline-2">
-<h2 id="org050f512">Remove</h2>
-<div class="outline-text-2" id="text-org050f512">
+<div id="outline-container-org7824ccf" class="outline-2">
+<h2 id="org7824ccf">Remove</h2>
+<div class="outline-text-2" id="text-org7824ccf">
 <p>
 So maybe you're running Android and the phone came with some apps already installed. Almost certainly they'll be proprietary. Go to Settings/Apps and then uninstall or deactivate any apps which you really don't need. Mostly preinstalled apps are intended to send your data to companies who will then sell it to advertisers or governments under the business model of <i>surveillance capital</i>. It's not a good idea to get caught up in that, and to avoid becoming addicted to apps which are surveilling you without consent or installing spyware in the background without your knowledge.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org29f4fb3" class="outline-2">
-<h2 id="org29f4fb3">Encrypt</h2>
-<div class="outline-text-2" id="text-org29f4fb3">
+<div id="outline-container-org69a25b9" class="outline-2">
+<h2 id="org69a25b9">Encrypt</h2>
+<div class="outline-text-2" id="text-org69a25b9">
 <p>
 Encrypt your phone. This can usually be done via <b>Settings/Security</b> and you may need to fully charge the phone first. Encryption means that if you lose your phone or it gets stolen then there is less chance that anyone who picks it up will get access to your data, photos and so on.
 </p>
 </div>
 </div>
 
-<div id="outline-container-orgd8e9683" class="outline-2">
-<h2 id="orgd8e9683">Apps</h2>
-<div class="outline-text-2" id="text-orgd8e9683">
+<div id="outline-container-org843df41" class="outline-2">
+<h2 id="org843df41">Apps</h2>
+<div class="outline-text-2" id="text-org843df41">
 <p>
 Installing <b>F-droid</b> and only adding any new apps via F-droid will ensure that you are always using free and open source software. Open source is not a panacea, since bugs can and do still occur, but it will help you to avoid the worst security and privacy pitfalls.
 </p>
 </div>
 </div>
 
-<div id="outline-container-orgcf9fd9c" class="outline-2">
-<h2 id="orgcf9fd9c">Lock</h2>
-<div class="outline-text-2" id="text-orgcf9fd9c">
+<div id="outline-container-orga3c7ee3" class="outline-2">
+<h2 id="orga3c7ee3">Lock</h2>
+<div class="outline-text-2" id="text-orga3c7ee3">
 <p>
 Add a lock screen, preferably with a password which is not easy for other people to guess or for quicker access with a PIN number. Install an app called <b>Locker</b>, activate it and set the maximum number of password guesses to ten (or whatever you feel comfortable with). If bad people get hold of your phone then they may try to brute force your lock screen password or PIN (i.e. automatically trying millions of common word and number combinations) and the locker app will prevent them from succeeding by resetting the phone back to its factory default condition and wiping the data.
 </p>
 </div>
 </div>
 
-<div id="outline-container-orgae1898b" class="outline-2">
-<h2 id="orgae1898b">Onion</h2>
-<div class="outline-text-2" id="text-orgae1898b">
+<div id="outline-container-org86f5c36" class="outline-2">
+<h2 id="org86f5c36">Onion</h2>
+<div class="outline-text-2" id="text-org86f5c36">
 <p>
 Both governments and corporations want to compile matadata dossiers about you. Who you communicated with, when and how often. They want this so that they can data mine, simulate, predict and then ultimately influence (sometimes also called "nudge") your actions and preferences in the directions they prefer. By routing your connections through a number of proxy servers (Tor routers) you can make it perhaps not <i>theoretically</i> impossible but at least <i>very hard</i> for them to have a complete and accurate list of who your friends are, your religion, politics, likely health issues, sexual orientation and what news sites or books you read.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org6b540e5" class="outline-2">
-<h2 id="org6b540e5">Email</h2>
-<div class="outline-text-2" id="text-org6b540e5">
+<div id="outline-container-orgd32a4ef" class="outline-2">
+<h2 id="orgd32a4ef">Email</h2>
+<div class="outline-text-2" id="text-orgd32a4ef">
 <p>
 The easiest way to access email is by installing the <a href="./app_mailpile.html">Mailpile</a> app. This keeps your GPG keys off of possibly insecure mobile devices but still enables encrypted email communications in an easy way. You can use K9 mail if you prefer, but that will require installing OpenKeychain and having your GPG keys on the device, which is a lot more risky.
 </p>
 </div>
 </div>
-<div id="outline-container-org62a2756" class="outline-2">
-<h2 id="org62a2756">Services</h2>
-<div class="outline-text-2" id="text-org62a2756">
+<div id="outline-container-orgb2231db" class="outline-2">
+<h2 id="orgb2231db">Services</h2>
+<div class="outline-text-2" id="text-orgb2231db">
 <p>
 For information on configuring various apps to work with Freedombone see the <a href="./usage.html">usage section</a>. Also see advice on chat apps in the <a href="./faq.html">FAQ</a>.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org59a272b" class="outline-2">
-<h2 id="org59a272b">Battery preservation</h2>
-<div class="outline-text-2" id="text-org59a272b">
+<div id="outline-container-org59cc6a8" class="outline-2">
+<h2 id="org59cc6a8">Battery</h2>
+<div class="outline-text-2" id="text-org59cc6a8">
 <p>
 Even with free software apps it's not difficult to get into a situation where your battery doesn't last for long. To maximize battery life access RSS feeds via the onion-based mobile reader within a Tor-compatible browser and not from a locally installed RSS app.
 </p>
 <p>
 If you're using the Riot mobile app to access a Matrix homeserver then you can significantly improve battery performance by going to the settings and changing <b>Sync request timeout</b> to 30 seconds and <b>Delay between two sync requests</b> to 600 seconds.
 </p>
+
+<p>
+It's also recommended to disable battery optimisations for Conversations and Orbot. If you don't do that then you may have trouble receiving messages or some parts of the protocol may break. That can be done by going to <b>Settings</b>, selecting <b>Battery</b> then opening the menu (top right) and selecting <b>Battery optimisations</b> then selecting <b>Not optimised</b> and <b>All apps</b>, then finally choosing Conversations and Orbot not to be optimised.
+</p>
 </div>
 </div>
 
-<div id="outline-container-org56572e8" class="outline-2">
-<h2 id="org56572e8">Blocking bad domains</h2>
-<div class="outline-text-2" id="text-org56572e8">
+<div id="outline-container-org808ec5c" class="outline-2">
+<h2 id="org808ec5c">Blocking bad domains</h2>
+<div class="outline-text-2" id="text-org808ec5c">
 <p>
 You can block known bad domains by editing the <b>/system/etc/hosts</b> file on your device. It is possible to use extensive ad-blocking hosts files used by other ad-blocking systems such as pi-hole, but merely blocking Facebook and Google Analytics will protect you against much of the corporate surveillance which goes on. Even if you don't have a Facebook account this may still be useful since they will still try to create a "ghost profile" of you, so the less data they have the better.
 </p>