Browse Source

Add monkeysphere subkey

Bob Mottram 9 years ago
parent
commit
f4a93a3f71
No account linked to committer's email
4 changed files with 135 additions and 119 deletions
  1. 9
    3
      doc/EN/usage.org
  2. 1
    0
      src/freedombone
  3. 3
    0
      src/freedombone-adduser
  4. 122
    116
      website/EN/usage.html

+ 9
- 3
doc/EN/usage.org View File

@@ -79,9 +79,15 @@ ssh username@freedombone.local -p 2222
79 79
 Select /Administrator controls/ then select "About this system" and look for the onion address for ssh. You can then close the terminal and open another, then do the following:
80 80
 
81 81
 #+BEGIN_SRC bash
82
-sudo apt-get install tor connect-proxy
83
-echo 'Host *.onion' >> ~/.ssh/config
84
-echo 'ProxyCommand connect -R remote -5 -S 127.0.0.1:9050 %h %p' >> ~/.ssh/config
82
+sudo apt-get install tor connect-proxy monkeysphere
83
+echo 'Host *.onion
84
+    ServerAliveInterval 60
85
+    ServerAliveCountMax 3
86
+	ProxyCommand sh -c 'monkeysphere ssh-proxycommand --no-connect %h %p ; connect -R remote -5 -S 127.0.0.1:9050 %h %p'
87
+Host *
88
+    ServerAliveInterval 60
89
+    ServerAliveCountMax 3
90
+    ProxyCommand monkeysphere ssh-proxycommand %h %p' > ~/.ssh/config
85 91
 ssh username@address.onion -p 2222
86 92
 #+END_SRC
87 93
 

+ 1
- 0
src/freedombone View File

@@ -5343,6 +5343,7 @@ function install_monkeysphere {
5343 5343
         return
5344 5344
     fi
5345 5345
     apt-get -y install monkeysphere msva-perl
5346
+	su -c "monkeysphere gen-subkey $MY_GPG_PUBLIC_KEY_ID" - $MY_USERNAME
5346 5347
 
5347 5348
     echo 'install_monkeysphere' >> $COMPLETION_FILE
5348 5349
 }

+ 3
- 0
src/freedombone-adduser View File

@@ -137,6 +137,9 @@ if [ ! -f $MY_GPG_PUBLIC_KEY ]; then
137 137
     userdel -r $MY_USERNAME
138 138
     exit 7
139 139
 fi
140
+# add a monkeysphere subkey
141
+su -c "monkeysphere gen-subkey $MY_GPG_PUBLIC_KEY_ID" - $MY_USERNAME
142
+
140 143
 
141 144
 if [ -f /home/$MY_USERNAME/.muttrc ]; then
142 145
     # encrypt outgoing mail to the "sent" folder

+ 122
- 116
website/EN/usage.html View File

@@ -3,7 +3,7 @@
3 3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4 4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5 5
 <head>
6
-<!-- 2016-04-17 Sun 19:22 -->
6
+<!-- 2016-04-28 Thu 10:18 -->
7 7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8 8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9 9
 <title></title>
@@ -170,15 +170,15 @@ for the JavaScript code in this tag.
170 170
 </colgroup>
171 171
 <tbody>
172 172
 <tr>
173
-<td class="org-left"><a href="#orgheadline1">Readme</a></td>
173
+<td class="org-left"><a href="#orgb8d0518">Readme</a></td>
174 174
 </tr>
175 175
 
176 176
 <tr>
177
-<td class="org-left"><a href="#orgheadline2">Improving ssh security</a></td>
177
+<td class="org-left"><a href="#org15372e2">Improving ssh security</a></td>
178 178
 </tr>
179 179
 
180 180
 <tr>
181
-<td class="org-left"><a href="#orgheadline3">Administrating the system via an onion address (Tor)</a></td>
181
+<td class="org-left"><a href="#orgd478c98">Administrating the system via an onion address (Tor)</a></td>
182 182
 </tr>
183 183
 
184 184
 <tr>
@@ -190,38 +190,38 @@ for the JavaScript code in this tag.
190 190
 </tr>
191 191
 
192 192
 <tr>
193
-<td class="org-left"><a href="#orgheadline4">Syncing to the Cloud</a></td>
193
+<td class="org-left"><a href="#org1bbc6b5">Syncing to the Cloud</a></td>
194 194
 </tr>
195 195
 
196 196
 <tr>
197
-<td class="org-left"><a href="#orgheadline5">Play Music</a></td>
197
+<td class="org-left"><a href="#org453b91c">Play Music</a></td>
198 198
 </tr>
199 199
 
200 200
 <tr>
201
-<td class="org-left"><a href="#orgheadline6">Microblogging (GNU Social)</a></td>
201
+<td class="org-left"><a href="#org97eea7">Microblogging (GNU Social)</a></td>
202 202
 </tr>
203 203
 
204 204
 <tr>
205
-<td class="org-left"><a href="#orgheadline7">Social Network</a></td>
205
+<td class="org-left"><a href="#org7d5a751">Social Network</a></td>
206 206
 </tr>
207 207
 
208 208
 <tr>
209
-<td class="org-left"><a href="#orgheadline8">Chat Services</a></td>
209
+<td class="org-left"><a href="#org52dcd3">Chat Services</a></td>
210 210
 </tr>
211 211
 
212 212
 <tr>
213
-<td class="org-left"><a href="#orgheadline9">RSS Reader</a></td>
213
+<td class="org-left"><a href="#orgc9796fa">RSS Reader</a></td>
214 214
 </tr>
215 215
 
216 216
 <tr>
217
-<td class="org-left"><a href="#orgheadline10">Adding or removing users</a></td>
217
+<td class="org-left"><a href="#org44b8914">Adding or removing users</a></td>
218 218
 </tr>
219 219
 </tbody>
220 220
 </table>
221 221
 
222
-<div id="outline-container-orgheadline1" class="outline-2">
223
-<h2 id="orgheadline1">Readme</h2>
224
-<div class="outline-text-2" id="text-orgheadline1">
222
+<div id="outline-container-orgb8d0518" class="outline-2">
223
+<h2 id="orgb8d0518">Readme</h2>
224
+<div class="outline-text-2" id="text-orgb8d0518">
225 225
 <p>
226 226
 After the system has installed a README file will be generated which contains passwords and some brief advice on using the installed systems. You can read this with the following commands:
227 227
 </p>
@@ -242,9 +242,9 @@ To exit you can either just close the terminal or use <b>CTRL-x CTRL-c</b> follo
242 242
 </p>
243 243
 </div>
244 244
 </div>
245
-<div id="outline-container-orgheadline2" class="outline-2">
246
-<h2 id="orgheadline2">Improving ssh security</h2>
247
-<div class="outline-text-2" id="text-orgheadline2">
245
+<div id="outline-container-org15372e2" class="outline-2">
246
+<h2 id="org15372e2">Improving ssh security</h2>
247
+<div class="outline-text-2" id="text-org15372e2">
248 248
 <p>
249 249
 To improve ssh security you can generate an ssh key pair on your system and then upload the public key to the Freedombone.
250 250
 </p>
@@ -297,9 +297,9 @@ If you wish to only use ssh keys then log in to the Freedombone, become the root
297 297
 </div>
298 298
 </div>
299 299
 
300
-<div id="outline-container-orgheadline3" class="outline-2">
301
-<h2 id="orgheadline3">Administrating the system via an onion address (Tor)</h2>
302
-<div class="outline-text-2" id="text-orgheadline3">
300
+<div id="outline-container-orgd478c98" class="outline-2">
301
+<h2 id="orgd478c98">Administrating the system via an onion address (Tor)</h2>
302
+<div class="outline-text-2" id="text-orgd478c98">
303 303
 <p>
304 304
 You can also access your system via the Tor system using an onion address. To find out what the onion address for ssh access is you can do the following:
305 305
 </p>
@@ -316,9 +316,15 @@ Select <i>Administrator controls</i> then select "About this system" and look fo
316 316
 
317 317
 <div class="org-src-container">
318 318
 
319
-<pre class="src src-bash">sudo apt-get install tor connect-proxy
320
-<span class="org-builtin">echo</span> <span class="org-string">'Host *.onion'</span> &gt;&gt; ~/.ssh/config
321
-<span class="org-builtin">echo</span> <span class="org-string">'ProxyCommand connect -R remote -5 -S 127.0.0.1:9050 %h %p'</span> &gt;&gt; ~/.ssh/config
319
+<pre class="src src-bash">sudo apt-get install tor connect-proxy monkeysphere
320
+<span class="org-builtin">echo</span> <span class="org-string">'Host *.onion</span>
321
+<span class="org-string">    ServerAliveInterval 60</span>
322
+<span class="org-string">    ServerAliveCountMax 3</span>
323
+<span class="org-string">    ProxyCommand sh -c '</span>monkeysphere ssh-proxycommand --no-connect %h %p ; connect -R remote -5 -S 127.0.0.1:9050 %h %p<span class="org-string">'</span>
324
+<span class="org-string">Host *</span>
325
+<span class="org-string">    ServerAliveInterval 60</span>
326
+<span class="org-string">    ServerAliveCountMax 3</span>
327
+<span class="org-string">    ProxyCommand monkeysphere ssh-proxycommand %h %p'</span> &gt; ~/.ssh/config
322 328
 ssh username@address.onion -p 2222
323 329
 </pre>
324 330
 </div>
@@ -328,9 +334,9 @@ Subsequently even if dynamic DNS isn't working you may still be able to administ
328 334
 </p>
329 335
 </div>
330 336
 </div>
331
-<div id="outline-container-orgheadline4" class="outline-2">
332
-<h2 id="orgheadline4">Syncing to the Cloud</h2>
333
-<div class="outline-text-2" id="text-orgheadline4">
337
+<div id="outline-container-org1bbc6b5" class="outline-2">
338
+<h2 id="org1bbc6b5">Syncing to the Cloud</h2>
339
+<div class="outline-text-2" id="text-org1bbc6b5">
334 340
 <p>
335 341
 <a href="https://syncthing.net/">Syncthing</a> provides a similar capability to proprietary systems such as <a href="http://www.drop-dropbox.com/">Dropbox</a>, and also is well suited for use with low power single board computers. You can have one or more directories which are synchronized across your various laptops/desktops/devices, and this makes it hard for you to ever lose important files. The manner in which the synchronization is done is pretty secure, such that it would be difficult for passive adversaries (mass surveillance, "<i>men in the middle</i>", etc) to know what files you're sharing. Of course, you don't necessarily need to be running a server in order to use Syncthing, but if you do have a server which is always running then there's always at least one place to synchronize your files to or from.
336 342
 </p>
@@ -340,9 +346,9 @@ Freedombone provides Syncthing shared directories for each user on the system, p
340 346
 </p>
341 347
 </div>
342 348
 
343
-<div id="outline-container-orgheadline11" class="outline-3">
344
-<h3 id="orgheadline11">On a laptop</h3>
345
-<div class="outline-text-3" id="text-orgheadline11">
349
+<div id="outline-container-org8345a03" class="outline-3">
350
+<h3 id="org8345a03">On a laptop</h3>
351
+<div class="outline-text-3" id="text-org8345a03">
346 352
 <p>
347 353
 Install syncthing:
348 354
 </p>
@@ -397,9 +403,9 @@ Now wait for a few minutes. Eventually you will see two messages appear within t
397 403
 </p>
398 404
 </div>
399 405
 </div>
400
-<div id="outline-container-orgheadline12" class="outline-3">
401
-<h3 id="orgheadline12">On Android</h3>
402
-<div class="outline-text-3" id="text-orgheadline12">
406
+<div id="outline-container-org75fef9b" class="outline-3">
407
+<h3 id="org75fef9b">On Android</h3>
408
+<div class="outline-text-3" id="text-org75fef9b">
403 409
 <p>
404 410
 Install Syncthing and Connectbot from F-droid.
405 411
 </p>
@@ -430,12 +436,12 @@ Now wait for a few minutes or more. Eventually you should receive two notificati
430 436
 </div>
431 437
 </div>
432 438
 </div>
433
-<div id="outline-container-orgheadline5" class="outline-2">
434
-<h2 id="orgheadline5">Play Music</h2>
435
-<div class="outline-text-2" id="text-orgheadline5">
436
-</div><div id="outline-container-orgheadline13" class="outline-3">
437
-<h3 id="orgheadline13">With the DLNA service</h3>
438
-<div class="outline-text-3" id="text-orgheadline13">
439
+<div id="outline-container-org453b91c" class="outline-2">
440
+<h2 id="org453b91c">Play Music</h2>
441
+<div class="outline-text-2" id="text-org453b91c">
442
+</div><div id="outline-container-org9d1b132" class="outline-3">
443
+<h3 id="org9d1b132">With the DLNA service</h3>
444
+<div class="outline-text-3" id="text-org9d1b132">
439 445
 <p>
440 446
 An easy way to play music on any mobile device in your home is to use the DLNA service. Copy your music into a directory called "<i>Music</i>" on a USB thumb drive and then insert it into from socket on the Beaglebone.
441 447
 </p>
@@ -476,9 +482,9 @@ The DLNA service will only work within your local home network, and isn't remote
476 482
 </div>
477 483
 </div>
478 484
 
479
-<div id="outline-container-orgheadline6" class="outline-2">
480
-<h2 id="orgheadline6">Microblogging (GNU Social)</h2>
481
-<div class="outline-text-2" id="text-orgheadline6">
485
+<div id="outline-container-org97eea7" class="outline-2">
486
+<h2 id="org97eea7">Microblogging (GNU Social)</h2>
487
+<div class="outline-text-2" id="text-org97eea7">
482 488
 <p>
483 489
 To log into your GNU Social site first obtain your username and password from the "microblogging" section of the readme file.
484 490
 </p>
@@ -507,20 +513,20 @@ GNU Social has a clutter-free mobile user interface which can be accessed via a
507 513
 </div>
508 514
 </div>
509 515
 
510
-<div id="outline-container-orgheadline7" class="outline-2">
511
-<h2 id="orgheadline7">Social Network</h2>
512
-<div class="outline-text-2" id="text-orgheadline7">
513
-</div><div id="outline-container-orgheadline14" class="outline-3">
514
-<h3 id="orgheadline14">Domains</h3>
515
-<div class="outline-text-3" id="text-orgheadline14">
516
+<div id="outline-container-org7d5a751" class="outline-2">
517
+<h2 id="org7d5a751">Social Network</h2>
518
+<div class="outline-text-2" id="text-org7d5a751">
519
+</div><div id="outline-container-org9b2e349" class="outline-3">
520
+<h3 id="org9b2e349">Domains</h3>
521
+<div class="outline-text-3" id="text-org9b2e349">
516 522
 <p>
517 523
 Both Hubzilla and GNU Social try to obtain certificates automatically at the time of installation via Let's Encrypt. This will likely mean that in order for this to work you'll need to have obtained at least one "official" domain via a domain selling service, since Let's Encrypt mostly doesn't seem to work with free subdomains from sites such as freeDNS.
518 524
 </p>
519 525
 </div>
520 526
 </div>
521
-<div id="outline-container-orgheadline15" class="outline-3">
522
-<h3 id="orgheadline15">Initial install</h3>
523
-<div class="outline-text-3" id="text-orgheadline15">
527
+<div id="outline-container-orgd960090" class="outline-3">
528
+<h3 id="orgd960090">Initial install</h3>
529
+<div class="outline-text-3" id="text-orgd960090">
524 530
 <p>
525 531
 On first visiting your Hubzilla site you'll see the login screen. The first thing you need to do is <b>register</b> a new user. The first user on the system then becomes its administrator.
526 532
 </p>
@@ -534,19 +540,19 @@ On first visiting your Hubzilla site you'll see the login screen. The first thin
534 540
 </div>
535 541
 </div>
536 542
 
537
-<div id="outline-container-orgheadline8" class="outline-2">
538
-<h2 id="orgheadline8">Chat Services</h2>
539
-<div class="outline-text-2" id="text-orgheadline8">
540
-</div><div id="outline-container-orgheadline16" class="outline-3">
541
-<h3 id="orgheadline16">IRC</h3>
542
-<div class="outline-text-3" id="text-orgheadline16">
543
+<div id="outline-container-org52dcd3" class="outline-2">
544
+<h2 id="org52dcd3">Chat Services</h2>
545
+<div class="outline-text-2" id="text-org52dcd3">
546
+</div><div id="outline-container-org8993cea" class="outline-3">
547
+<h3 id="org8993cea">IRC</h3>
548
+<div class="outline-text-3" id="text-org8993cea">
543 549
 <p>
544 550
 IRC is useful for multi-user chat. The classic use case is for software development where many engineers might need to coordinate their activities, but it's also useful for meetings, parties and general socialising.
545 551
 </p>
546 552
 </div>
547
-<div id="outline-container-orgheadline17" class="outline-4">
548
-<h4 id="orgheadline17">Irssi</h4>
549
-<div class="outline-text-4" id="text-orgheadline17">
553
+<div id="outline-container-org93c9ee" class="outline-4">
554
+<h4 id="org93c9ee">Irssi</h4>
555
+<div class="outline-text-4" id="text-org93c9ee">
550 556
 <p>
551 557
 The easiest way to use irssi is to connect to your system, like this:
552 558
 </p>
@@ -562,9 +568,9 @@ Then select <b>IRC</b> from the menu. However, other than via this method using
562 568
 </p>
563 569
 </div>
564 570
 </div>
565
-<div id="outline-container-orgheadline18" class="outline-4">
566
-<h4 id="orgheadline18">XChat</h4>
567
-<div class="outline-text-4" id="text-orgheadline18">
571
+<div id="outline-container-org2659bec" class="outline-4">
572
+<h4 id="org2659bec">XChat</h4>
573
+<div class="outline-text-4" id="text-org2659bec">
568 574
 <p>
569 575
 XChat is compatible with proxying via Tor and so provides the best security when connecting to your IRC server. It will allow you to connect to your IRC server's onion address.
570 576
 </p>
@@ -742,9 +748,9 @@ Click <b>close</b> and then <b>connect</b>.
742 748
 </div>
743 749
 </div>
744 750
 
745
-<div id="outline-container-orgheadline19" class="outline-4">
746
-<h4 id="orgheadline19">Changing or removing the IRC password</h4>
747
-<div class="outline-text-4" id="text-orgheadline19">
751
+<div id="outline-container-orgbbdd5ef" class="outline-4">
752
+<h4 id="orgbbdd5ef">Changing or removing the IRC password</h4>
753
+<div class="outline-text-4" id="text-orgbbdd5ef">
748 754
 <p>
749 755
 By default the IRC server is set up to require a password for users to log in. The password is the same for all users. If you want to change or remove the password:
750 756
 </p>
@@ -762,12 +768,12 @@ Select <i>Administrator controls</i> then <b>IRC Menu</b> and then change the pa
762 768
 </div>
763 769
 </div>
764 770
 
765
-<div id="outline-container-orgheadline25" class="outline-3">
766
-<h3 id="orgheadline25">XMPP/Jabber</h3>
767
-<div class="outline-text-3" id="text-orgheadline25">
768
-</div><div id="outline-container-orgheadline20" class="outline-4">
769
-<h4 id="orgheadline20">Using with Profanity</h4>
770
-<div class="outline-text-4" id="text-orgheadline20">
771
+<div id="outline-container-orge9a313d" class="outline-3">
772
+<h3 id="orge9a313d">XMPP/Jabber</h3>
773
+<div class="outline-text-3" id="text-orge9a313d">
774
+</div><div id="outline-container-org29949df" class="outline-4">
775
+<h4 id="org29949df">Using with Profanity</h4>
776
+<div class="outline-text-4" id="text-org29949df">
771 777
 <p>
772 778
 The <a href="http://profanity.im/">Profanity</a> shell based user interface and is perhaps the simplest way to use XMPP from a laptop. It's also a good way to ensure that your OTR keys are the same even when logging in from different laptops or devices, and it also means that if those devices later become compomised then there are no locally stored OTR keys to be found.
773 779
 </p>
@@ -857,9 +863,9 @@ When accessed via the user control panel the client is automatically routed thro
857 863
 </p>
858 864
 </div>
859 865
 </div>
860
-<div id="outline-container-orgheadline21" class="outline-4">
861
-<h4 id="orgheadline21">Using with Jitsi</h4>
862
-<div class="outline-text-4" id="text-orgheadline21">
866
+<div id="outline-container-org7cc25e5" class="outline-4">
867
+<h4 id="org7cc25e5">Using with Jitsi</h4>
868
+<div class="outline-text-4" id="text-org7cc25e5">
863 869
 <p>
864 870
 Jitsi is the recommended communications client for desktop or laptop systems, since it includes the <i>off the record</i> (OTR) feature which provides some additional security beyond the usual SSL certificates.
865 871
 </p>
@@ -889,9 +895,9 @@ You can also <a href="https://www.youtube.com/watch?v=vgx7VSrDGjk">see this vide
889 895
 </p>
890 896
 </div>
891 897
 </div>
892
-<div id="outline-container-orgheadline22" class="outline-4">
893
-<h4 id="orgheadline22">Using with Ubuntu</h4>
894
-<div class="outline-text-4" id="text-orgheadline22">
898
+<div id="outline-container-org8e01af5" class="outline-4">
899
+<h4 id="org8e01af5">Using with Ubuntu</h4>
900
+<div class="outline-text-4" id="text-org8e01af5">
895 901
 <p>
896 902
 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.
897 903
 </p>
@@ -909,17 +915,17 @@ Click on <b>Advanced</b> and make sure that <b>Encryption required</b> and <b>Ig
909 915
 </p>
910 916
 </div>
911 917
 </div>
912
-<div id="outline-container-orgheadline23" class="outline-4">
913
-<h4 id="orgheadline23">Using Tor Messenger</h4>
914
-<div class="outline-text-4" id="text-orgheadline23">
918
+<div id="outline-container-orgc91ef96" class="outline-4">
919
+<h4 id="orgc91ef96">Using Tor Messenger</h4>
920
+<div class="outline-text-4" id="text-orgc91ef96">
915 921
 <p>
916 922
 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.
917 923
 </p>
918 924
 </div>
919 925
 </div>
920
-<div id="outline-container-orgheadline24" class="outline-4">
921
-<h4 id="orgheadline24">Using with Android</h4>
922
-<div class="outline-text-4" id="text-orgheadline24">
926
+<div id="outline-container-org44ad61e" class="outline-4">
927
+<h4 id="org44ad61e">Using with Android</h4>
928
+<div class="outline-text-4" id="text-org44ad61e">
923 929
 <p>
924 930
 Install <a href="https://f-droid.org/">F-Droid</a>
925 931
 </p>
@@ -955,16 +961,16 @@ Then select <b>Next</b>. When chatting you can use the lock icon to encrypt your
955 961
 </div>
956 962
 </div>
957 963
 </div>
958
-<div id="outline-container-orgheadline26" class="outline-3">
959
-<h3 id="orgheadline26">Tox</h3>
960
-<div class="outline-text-3" id="text-orgheadline26">
964
+<div id="outline-container-orgcc56792" class="outline-3">
965
+<h3 id="orgcc56792">Tox</h3>
966
+<div class="outline-text-3" id="text-orgcc56792">
961 967
 <p>
962 968
 Tox is an encrypted peer-to-peer messaging system and so should work without Freedombone. It uses a system of nodes which act as a sort of directory service allowing users to find and connect to each other. The Tox node ID on the Freedombone can be found within the README within your home directory. If you have other users connect to your node then you will be able to continue chatting even when no other nodes are available.
963 969
 </p>
964 970
 </div>
965
-<div id="outline-container-orgheadline27" class="outline-4">
966
-<h4 id="orgheadline27">Using the Toxic client</h4>
967
-<div class="outline-text-4" id="text-orgheadline27">
971
+<div id="outline-container-org475267b" class="outline-4">
972
+<h4 id="org475267b">Using the Toxic client</h4>
973
+<div class="outline-text-4" id="text-org475267b">
968 974
 <p>
969 975
 Log into your system with:
970 976
 </p>
@@ -988,12 +994,12 @@ Then from the menu select <b>Tox Chat</b>. Tox is encrypted by default and also
988 994
 </div>
989 995
 </div>
990 996
 
991
-<div id="outline-container-orgheadline30" class="outline-3">
992
-<h3 id="orgheadline30">VoIP (Voice chat)</h3>
993
-<div class="outline-text-3" id="text-orgheadline30">
994
-</div><div id="outline-container-orgheadline28" class="outline-4">
995
-<h4 id="orgheadline28">Using with Ubuntu</h4>
996
-<div class="outline-text-4" id="text-orgheadline28">
997
+<div id="outline-container-orgc8b07b8" class="outline-3">
998
+<h3 id="orgc8b07b8">VoIP (Voice chat)</h3>
999
+<div class="outline-text-3" id="text-orgc8b07b8">
1000
+</div><div id="outline-container-org960fab7" class="outline-4">
1001
+<h4 id="org960fab7">Using with Ubuntu</h4>
1002
+<div class="outline-text-4" id="text-org960fab7">
997 1003
 <p>
998 1004
 Within the software center search for "mumble" and install the client then run it. Skip through the audio setup wizard.
999 1005
 </p>
@@ -1007,9 +1013,9 @@ Click on "add new" to add a new server and enter the default domain name for the
1007 1013
 </p>
1008 1014
 </div>
1009 1015
 </div>
1010
-<div id="outline-container-orgheadline29" class="outline-4">
1011
-<h4 id="orgheadline29">Using with Android</h4>
1012
-<div class="outline-text-4" id="text-orgheadline29">
1016
+<div id="outline-container-orgbe251ef" class="outline-4">
1017
+<h4 id="orgbe251ef">Using with Android</h4>
1018
+<div class="outline-text-4" id="text-orgbe251ef">
1013 1019
 <p>
1014 1020
 Install <a href="https://f-droid.org/">F-Droid</a>
1015 1021
 </p>
@@ -1036,24 +1042,24 @@ Selecting the server by pressing on it then connects you to the server so that y
1036 1042
 </div>
1037 1043
 </div>
1038 1044
 </div>
1039
-<div id="outline-container-orgheadline31" class="outline-3">
1040
-<h3 id="orgheadline31">SIP phones</h3>
1041
-<div class="outline-text-3" id="text-orgheadline31">
1045
+<div id="outline-container-org44aee6" class="outline-3">
1046
+<h3 id="org44aee6">SIP phones</h3>
1047
+<div class="outline-text-3" id="text-org44aee6">
1042 1048
 <p>
1043 1049
 Freedombone also supports SIP phones The username and domain is the same as for your email address, and the SIP password and extension number will appear within the README file in your home directory. Various SIP client options are available, such as CSipSimple on Android and Jitsi on desktop or laptop machines. Ideally use clients which support ZRTP, which will provide the best level of security.
1044 1050
 </p>
1045 1051
 </div>
1046
-<div id="outline-container-orgheadline32" class="outline-4">
1047
-<h4 id="orgheadline32">About ZRTP</h4>
1048
-<div class="outline-text-4" id="text-orgheadline32">
1052
+<div id="outline-container-orgbef1b36" class="outline-4">
1053
+<h4 id="orgbef1b36">About ZRTP</h4>
1054
+<div class="outline-text-4" id="text-orgbef1b36">
1049 1055
 <p>
1050 1056
 <a href="https://jitsi.org/Documentation/ZrtpFAQ">ZRTP</a> appears to be the current best standard to end-to-end encrypted voice calls, combining good security with simplicity of use. When the initial cryptographic negotiation between phones is done at the start of a call a short authentication string (SAS) is calculated and displayed at both ends. To check that there isn't anyone intercepting the call and acting as a <i>man in the middle</i> - as <a href="https://en.wikipedia.org/wiki/Stingray_phone_tracker">stingray type devices</a> try to do - the short authentication string can be read out and verbally confirmed between the callers. If it's the same then you can be pretty confident that the call is secure.
1051 1057
 </p>
1052 1058
 </div>
1053 1059
 </div>
1054
-<div id="outline-container-orgheadline33" class="outline-4">
1055
-<h4 id="orgheadline33">Using with CSIPSimple</h4>
1056
-<div class="outline-text-4" id="text-orgheadline33">
1060
+<div id="outline-container-orge70bc0b" class="outline-4">
1061
+<h4 id="orge70bc0b">Using with CSIPSimple</h4>
1062
+<div class="outline-text-4" id="text-orge70bc0b">
1057 1063
 <p>
1058 1064
 Add an account. Under <b>General Wizards</b> choose <b>Expert</b> and enter the following details:
1059 1065
 </p>
@@ -1109,9 +1115,9 @@ If everything is working the account should appear in green with a status of <b>
1109 1115
 </p>
1110 1116
 </div>
1111 1117
 </div>
1112
-<div id="outline-container-orgheadline34" class="outline-4">
1113
-<h4 id="orgheadline34">Using with Ring</h4>
1114
-<div class="outline-text-4" id="text-orgheadline34">
1118
+<div id="outline-container-org9ae3015" class="outline-4">
1119
+<h4 id="org9ae3015">Using with Ring</h4>
1120
+<div class="outline-text-4" id="text-org9ae3015">
1115 1121
 <p>
1116 1122
 From the menu select <b>Manage accounts</b>.
1117 1123
 </p>
@@ -1164,9 +1170,9 @@ Select the <b>Security</b> tab. Under <b>SRTP Key Exchange</b> select <b>ZRTP</b
1164 1170
 </div>
1165 1171
 </div>
1166 1172
 
1167
-<div id="outline-container-orgheadline9" class="outline-2">
1168
-<h2 id="orgheadline9">RSS Reader</h2>
1169
-<div class="outline-text-2" id="text-orgheadline9">
1173
+<div id="outline-container-orgc9796fa" class="outline-2">
1174
+<h2 id="orgc9796fa">RSS Reader</h2>
1175
+<div class="outline-text-2" id="text-orgc9796fa">
1170 1176
 <p>
1171 1177
 The way that RSS reading is set up on Freedombone gives you strong reading privacy. Not only is there onion routing between you and the server but also between the server and the source of the RSS feed. The only down side is that many RSS feeds are still http only, and so could be vulnerable to injection attacks, but it's expected that more of this will go to https in the foreseeable future due to a combination of growing recognition of security issues and systems like Let's Encrypt which make obtaining certificates much easier.
1172 1178
 </p>
@@ -1210,9 +1216,9 @@ A note for the paranoid is that on mobile devices you get redirected to a differ
1210 1216
 </blockquote>
1211 1217
 </div>
1212 1218
 </div>
1213
-<div id="outline-container-orgheadline10" class="outline-2">
1214
-<h2 id="orgheadline10">Adding or removing users</h2>
1215
-<div class="outline-text-2" id="text-orgheadline10">
1219
+<div id="outline-container-org44b8914" class="outline-2">
1220
+<h2 id="org44b8914">Adding or removing users</h2>
1221
+<div class="outline-text-2" id="text-org44b8914">
1216 1222
 <p>
1217 1223
 Log into the system with:
1218 1224
 </p>