Selaa lähdekoodia

Show tox bootstrap ID

Bob Mottram 8 vuotta sitten
vanhempi
commit
8674bb7faa
5 muutettua tiedostoa jossa 104 lisäystä ja 99 poistoa
  1. 9
    0
      src/freedombone-app-tox
  2. 11
    11
      website/EN/app_mumble.html
  3. 5
    5
      website/EN/app_tox.html
  4. 59
    59
      website/EN/installation.html
  5. 20
    24
      website/EN/usage.html

+ 9
- 0
src/freedombone-app-tox Näytä tiedosto

@@ -106,6 +106,15 @@ function install_interactive_tox {
106 106
     APP_INSTALLED=1
107 107
 }
108 108
 
109
+function configure_interactive_tox {
110
+    if [ ! -f $TOX_BOOTSTRAP_ID_FILE ]; then
111
+        return
112
+    fi
113
+    bootstrap_id=$(cat $TOX_BOOTSTRAP_ID_FILE)
114
+    dialog --title $"Tox Bootstrap Node" \
115
+           --msgbox $"$bootstrap_id" 6 70
116
+}
117
+
109 118
 function mesh_tox_qtox {
110 119
     if [ ! ${rootdir}$INSTALL_DIR ]; then
111 120
         INSTALL_DIR=${rootdir}/root/build

+ 11
- 11
website/EN/app_mumble.html Näytä tiedosto

@@ -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-11-20 Sun 16:26 -->
6
+<!-- 2016-11-20 Sun 16:31 -->
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>
@@ -251,18 +251,18 @@ for the JavaScript code in this tag.
251 251
 Mumble is a well known VoIP system originally used for gaming, but which works just as well for any general conference calls or meetings.
252 252
 </p>
253 253
 
254
-<div id="outline-container-org1fd07be" class="outline-2">
255
-<h2 id="org1fd07be">Text chat</h2>
256
-<div class="outline-text-2" id="text-org1fd07be">
254
+<div id="outline-container-orgb002e13" class="outline-2">
255
+<h2 id="orgb002e13">Text chat</h2>
256
+<div class="outline-text-2" id="text-orgb002e13">
257 257
 <p>
258 258
 In addition to voice it is also possible to do text chat via mumble. The security of this is pretty good provided that you do it via Plumble and Orbot on mobile, but compared to other options such as XMPP/Conversations or Tox the security is not as good, since the mumble server currently doesn't support forward secrecy.
259 259
 </p>
260 260
 </div>
261 261
 </div>
262 262
 
263
-<div id="outline-container-org0591866" class="outline-2">
264
-<h2 id="org0591866">Using with Ubuntu</h2>
265
-<div class="outline-text-2" id="text-org0591866">
263
+<div id="outline-container-org1832e9f" class="outline-2">
264
+<h2 id="org1832e9f">Using with Ubuntu</h2>
265
+<div class="outline-text-2" id="text-org1832e9f">
266 266
 <p>
267 267
 Within the software center search for "mumble" and install the client then run it. Skip through the audio setup wizard.
268 268
 </p>
@@ -273,9 +273,9 @@ Click on "add new" to add a new server and enter the default domain name for the
273 273
 </div>
274 274
 </div>
275 275
 
276
-<div id="outline-container-orgbe9ea62" class="outline-2">
277
-<h2 id="orgbe9ea62">Using with Android</h2>
278
-<div class="outline-text-2" id="text-orgbe9ea62">
276
+<div id="outline-container-org055c114" class="outline-2">
277
+<h2 id="org055c114">Using with Android</h2>
278
+<div class="outline-text-2" id="text-org055c114">
279 279
 <p>
280 280
 Install <a href="https://f-droid.org/">F-Droid</a>
281 281
 </p>
@@ -293,7 +293,7 @@ Press the plus button to add a Mumble server.
293 293
 </p>
294 294
 
295 295
 <p>
296
-Enter a label (which can be any name you choose for the server), the default domain name of the Freedombone or preferably the mumble onion address as shown on the <b>About</b> screen of the <b>Administrator control panel</b>, your username (which can also be anything) and the VoIP server password which can be found in the README file on the Freedombone.
296
+Enter a label (which can be any name you choose for the server), the default domain name of the Freedombone or preferably the mumble onion address as shown on the <b>About</b> screen of the <b>Administrator control panel</b>, your username (which can also be anything) and the mumble password which can be found in the <b>Passwords</b> section of the <b>Administrator control panel</b>.
297 297
 </p>
298 298
 
299 299
 <p>

+ 5
- 5
website/EN/app_tox.html Näytä tiedosto

@@ -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-11-12 Sat 22:23 -->
6
+<!-- 2016-11-20 Sun 16:32 -->
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>
@@ -248,12 +248,12 @@ for the JavaScript code in this tag.
248 248
 </center>
249 249
 
250 250
 <p>
251
-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.
251
+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 <b>App Settings</b> under <b>tox</b> within the <b>Administrator control panel</b>. If you have other users connect to your node then you will be able to continue chatting even when no other nodes are available.
252 252
 </p>
253 253
 
254
-<div id="outline-container-org51ad4cf" class="outline-2">
255
-<h2 id="org51ad4cf">The Toxic client</h2>
256
-<div class="outline-text-2" id="text-org51ad4cf">
254
+<div id="outline-container-org6e45c83" class="outline-2">
255
+<h2 id="org6e45c83">The Toxic client</h2>
256
+<div class="outline-text-2" id="text-org6e45c83">
257 257
 <p>
258 258
 Log into your system with:
259 259
 </p>

+ 59
- 59
website/EN/installation.html Näytä tiedosto

@@ -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-10-31 Mon 16:23 -->
6
+<!-- 2016-11-20 Sun 17:10 -->
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>
@@ -255,11 +255,11 @@ for the JavaScript code in this tag.
255 255
 </colgroup>
256 256
 <tbody>
257 257
 <tr>
258
-<td class="org-left"><a href="#org3995420">Building an image for a Single Board Computer or Virtual Machine</a></td>
258
+<td class="org-left"><a href="#orge03d33c">Building an image for a Single Board Computer or Virtual Machine</a></td>
259 259
 </tr>
260 260
 
261 261
 <tr>
262
-<td class="org-left"><a href="#org8399257">Checklist</a></td>
262
+<td class="org-left"><a href="#org175cfc0">Checklist</a></td>
263 263
 </tr>
264 264
 
265 265
 <tr>
@@ -267,34 +267,34 @@ for the JavaScript code in this tag.
267 267
 </tr>
268 268
 
269 269
 <tr>
270
-<td class="org-left"><a href="#org2fc6a30">Installation</a></td>
270
+<td class="org-left"><a href="#orgdf2add4">Installation</a></td>
271 271
 </tr>
272 272
 
273 273
 <tr>
274
-<td class="org-left"><a href="#org26423c9">Social Key Management - the 'Unforgettable Key'</a></td>
274
+<td class="org-left"><a href="#org9f6b4ea">Social Key Management - the 'Unforgettable Key'</a></td>
275 275
 </tr>
276 276
 
277 277
 <tr>
278
-<td class="org-left"><a href="#org03d29d8">Final Setup</a></td>
278
+<td class="org-left"><a href="#org27cecee">Final Setup</a></td>
279 279
 </tr>
280 280
 
281 281
 <tr>
282
-<td class="org-left"><a href="#org2817eb6">Keydrives</a></td>
282
+<td class="org-left"><a href="#org7b0166c">Keydrives</a></td>
283 283
 </tr>
284 284
 
285 285
 <tr>
286
-<td class="org-left"><a href="#org6d69295">On Client Machines</a></td>
286
+<td class="org-left"><a href="#orgab1d21b">On Client Machines</a></td>
287 287
 </tr>
288 288
 
289 289
 <tr>
290
-<td class="org-left"><a href="#orge549942">Administering the system</a></td>
290
+<td class="org-left"><a href="#orga6b2eee">Administering the system</a></td>
291 291
 </tr>
292 292
 </tbody>
293 293
 </table>
294 294
 
295
-<div id="outline-container-org3995420" class="outline-2">
296
-<h2 id="org3995420">Building an image for a Single Board Computer or Virtual Machine</h2>
297
-<div class="outline-text-2" id="text-org3995420">
295
+<div id="outline-container-orge03d33c" class="outline-2">
296
+<h2 id="orge03d33c">Building an image for a Single Board Computer or Virtual Machine</h2>
297
+<div class="outline-text-2" id="text-orge03d33c">
298 298
 <p>
299 299
 You don't have to trust images downloaded from random internet locations signed with untrusted keys. You can build one from scratch yourself, and this is the recommended procedure for maximum security. For guidance on how to build images see the manpage for the <b>freedombone-image</b> command.
300 300
 </p>
@@ -371,9 +371,9 @@ If the image build fails with an error such as "<i>Error reading from server. Re
371 371
 </div>
372 372
 </div>
373 373
 
374
-<div id="outline-container-org8399257" class="outline-2">
375
-<h2 id="org8399257">Checklist</h2>
376
-<div class="outline-text-2" id="text-org8399257">
374
+<div id="outline-container-org175cfc0" class="outline-2">
375
+<h2 id="org175cfc0">Checklist</h2>
376
+<div class="outline-text-2" id="text-org175cfc0">
377 377
 <p>
378 378
 Before installing Freedombone you will need a few things.
379 379
 </p>
@@ -387,17 +387,17 @@ Before installing Freedombone you will need a few things.
387 387
 </ul>
388 388
 </div>
389 389
 </div>
390
-<div id="outline-container-org2fc6a30" class="outline-2">
391
-<h2 id="org2fc6a30">Installation</h2>
392
-<div class="outline-text-2" id="text-org2fc6a30">
390
+<div id="outline-container-orgdf2add4" class="outline-2">
391
+<h2 id="orgdf2add4">Installation</h2>
392
+<div class="outline-text-2" id="text-orgdf2add4">
393 393
 <p>
394 394
 There are three install options: Laptop/Desktop/Netbook, SBC and Virtual Machine.
395 395
 </p>
396 396
 </div>
397 397
 
398
-<div id="outline-container-org9a6b0bc" class="outline-3">
399
-<h3 id="org9a6b0bc">On a Laptop, Netbook or Desktop machine</h3>
400
-<div class="outline-text-3" id="text-org9a6b0bc">
398
+<div id="outline-container-org9e79b36" class="outline-3">
399
+<h3 id="org9e79b36">On a Laptop, Netbook or Desktop machine</h3>
400
+<div class="outline-text-3" id="text-org9e79b36">
401 401
 <p>
402 402
 If you have an existing system, such as an old laptop or netbook which you can leave running as a server, then install a new version of Debian Jessie onto it. During the Debian install you won't need the print server or the desktop environment, and unchecking those will reduce the attack surface. Once Debian enter the following commands:
403 403
 </p>
@@ -415,9 +415,9 @@ freedombone menuconfig
415 415
 </div>
416 416
 </div>
417 417
 
418
-<div id="outline-container-orgdb17912" class="outline-3">
419
-<h3 id="orgdb17912">On a single board computer (SBC)</h3>
420
-<div class="outline-text-3" id="text-orgdb17912">
418
+<div id="outline-container-org28c34d0" class="outline-3">
419
+<h3 id="org28c34d0">On a single board computer (SBC)</h3>
420
+<div class="outline-text-3" id="text-org28c34d0">
421 421
 <p>
422 422
 Currently the following boards are supported:
423 423
 </p>
@@ -495,9 +495,9 @@ Using the password 'freedombone'. Take a note of the new login password and then
495 495
 </div>
496 496
 </div>
497 497
 
498
-<div id="outline-container-orgeba40e0" class="outline-3">
499
-<h3 id="orgeba40e0">As a Virtual Machine</h3>
500
-<div class="outline-text-3" id="text-orgeba40e0">
498
+<div id="outline-container-org770fac8" class="outline-3">
499
+<h3 id="org770fac8">As a Virtual Machine</h3>
500
+<div class="outline-text-3" id="text-org770fac8">
501 501
 <p>
502 502
 Qemu is currently supported, since it's s fully free software system. You can run a 64 bit Qemu image with:
503 503
 </p>
@@ -514,44 +514,44 @@ The default login will be username 'fbone' and password 'freedombone'. Take a no
514 514
 </div>
515 515
 </div>
516 516
 
517
-<div id="outline-container-org26423c9" class="outline-2">
518
-<h2 id="org26423c9">Social Key Management - the 'Unforgettable Key'</h2>
519
-<div class="outline-text-2" id="text-org26423c9">
517
+<div id="outline-container-org9f6b4ea" class="outline-2">
518
+<h2 id="org9f6b4ea">Social Key Management - the 'Unforgettable Key'</h2>
519
+<div class="outline-text-2" id="text-org9f6b4ea">
520 520
 <p>
521 521
 During the install procedure you will be asked if you wish to import GPG keys. If you don't already possess GPG keys then just select "Ok" and they will be generated during the install. If you do already have GPG keys then there are a few possibilities
522 522
 </p>
523 523
 </div>
524 524
 
525
-<div id="outline-container-org7242597" class="outline-3">
526
-<h3 id="org7242597">You have the gnupg keyring on an encrypted USB drive</h3>
527
-<div class="outline-text-3" id="text-org7242597">
525
+<div id="outline-container-orgc29300f" class="outline-3">
526
+<h3 id="orgc29300f">You have the gnupg keyring on an encrypted USB drive</h3>
527
+<div class="outline-text-3" id="text-orgc29300f">
528 528
 <p>
529 529
 If you previously made a master keydrive containing the full keyring (the .gnupg directory). This is the most straightforward case, but not as secure as splitting the key into fragments.
530 530
 </p>
531 531
 </div>
532 532
 </div>
533
-<div id="outline-container-org60195d8" class="outline-3">
534
-<h3 id="org60195d8">You have a number of key fragments on USB drives retrieved from friends</h3>
535
-<div class="outline-text-3" id="text-org60195d8">
533
+<div id="outline-container-org56b3c34" class="outline-3">
534
+<h3 id="org56b3c34">You have a number of key fragments on USB drives retrieved from friends</h3>
535
+<div class="outline-text-3" id="text-org56b3c34">
536 536
 <p>
537
-If you previously made some USB drives containing key fragments then retrieve them from your friends and plug them in one after the other. After the last drive has been read then remove it and just select "Ok". The system will then try to reconstruct the key. For this to work you will need to have previously made three or more <a href="#org2817eb6">Keydrives</a>.
537
+If you previously made some USB drives containing key fragments then retrieve them from your friends and plug them in one after the other. After the last drive has been read then remove it and just select "Ok". The system will then try to reconstruct the key. For this to work you will need to have previously made three or more <a href="#org7b0166c">Keydrives</a>.
538 538
 </p>
539 539
 </div>
540 540
 </div>
541
-<div id="outline-container-org7b11711" class="outline-3">
542
-<h3 id="org7b11711">You can specify some ssh login details for friends servers containing key fragments</h3>
543
-<div class="outline-text-3" id="text-org7b11711">
541
+<div id="outline-container-org32ca660" class="outline-3">
542
+<h3 id="org32ca660">You can specify some ssh login details for friends servers containing key fragments</h3>
543
+<div class="outline-text-3" id="text-org32ca660">
544 544
 <p>
545 545
 Enter three or more sets of login details and the installer will try to retrieve key fragments and then assemble them into the full key. This only works if you previously were using remote backups and had social key management enabled.
546 546
 </p>
547 547
 </div>
548 548
 </div>
549 549
 </div>
550
-<div id="outline-container-org03d29d8" class="outline-2">
551
-<h2 id="org03d29d8">Final Setup</h2>
552
-<div class="outline-text-2" id="text-org03d29d8">
550
+<div id="outline-container-org27cecee" class="outline-2">
551
+<h2 id="org27cecee">Final Setup</h2>
552
+<div class="outline-text-2" id="text-org27cecee">
553 553
 <p>
554
-Any manual post-installation setup instructions or passwords can be found in /home/username/README. You should remove any passwords from that file and store them within a password manager such as KeepassX.
554
+Any manual post-installation setup instructions or passwords can be found in /home/username/README.
555 555
 </p>
556 556
 
557 557
 <p>
@@ -667,16 +667,16 @@ On your internet router, typically under firewall settings, open the following p
667 667
 </div>
668 668
 </div>
669 669
 
670
-<div id="outline-container-org2817eb6" class="outline-2">
671
-<h2 id="org2817eb6">Keydrives</h2>
672
-<div class="outline-text-2" id="text-org2817eb6">
670
+<div id="outline-container-org7b0166c" class="outline-2">
671
+<h2 id="org7b0166c">Keydrives</h2>
672
+<div class="outline-text-2" id="text-org7b0166c">
673 673
 <p>
674 674
 After installing for the first time it's a good idea to create some keydrives. These will store your gpg key so that if all else fails you will still be able to restore from backup. There are two ways to do this:
675 675
 </p>
676 676
 </div>
677
-<div id="outline-container-org0ab125c" class="outline-3">
678
-<h3 id="org0ab125c">Master Keydrive</h3>
679
-<div class="outline-text-3" id="text-org0ab125c">
677
+<div id="outline-container-orgf3e3d0b" class="outline-3">
678
+<h3 id="orgf3e3d0b">Master Keydrive</h3>
679
+<div class="outline-text-3" id="text-orgf3e3d0b">
680 680
 <p>
681 681
 This is the traditional security model in which you carry your full keyring on an encrypted USB drive. To make a master keydrive first format a USB drive as a LUKS encrypted drive. In Ubuntu this can be <a href="https://help.ubuntu.com/community/EncryptedFilesystemsOnRemovableStorage">done from the <i>Disk Utility</i> application</a>. Then plug it into the Freedombone system, then from your local machine run:
682 682
 </p>
@@ -691,9 +691,9 @@ Select <i>Administrator controls</i> then <i>Backup and Restore</i> then <i>Back
691 691
 </p>
692 692
 </div>
693 693
 </div>
694
-<div id="outline-container-org2212b96" class="outline-3">
695
-<h3 id="org2212b96">Fragment keydrives</h3>
696
-<div class="outline-text-3" id="text-org2212b96">
694
+<div id="outline-container-org57b5534" class="outline-3">
695
+<h3 id="org57b5534">Fragment keydrives</h3>
696
+<div class="outline-text-3" id="text-org57b5534">
697 697
 <p>
698 698
 This breaks your GPG key into a number of fragments and randomly selects one to add to the USB drive. First format a USB drive as a LUKS encrypted drive. In Ubuntu this <a href="https://help.ubuntu.com/community/EncryptedFilesystemsOnRemovableStorage">can be done from the <i>Disk Utility</i> application</a>. Plug it into the Freedombone system then from your local machine run the following commands:
699 699
 </p>
@@ -713,9 +713,9 @@ Fragments are randomly assigned and so you will need at least three or four keyd
713 713
 </div>
714 714
 </div>
715 715
 </div>
716
-<div id="outline-container-org6d69295" class="outline-2">
717
-<h2 id="org6d69295">On Client Machines</h2>
718
-<div class="outline-text-2" id="text-org6d69295">
716
+<div id="outline-container-orgab1d21b" class="outline-2">
717
+<h2 id="orgab1d21b">On Client Machines</h2>
718
+<div class="outline-text-2" id="text-orgab1d21b">
719 719
 <p>
720 720
 You can configure laptops or desktop machines which connect to the Freedombone server in the following way. This alters encryption settings to improve overall security.
721 721
 </p>
@@ -732,9 +732,9 @@ freedombone-client
732 732
 </div>
733 733
 </div>
734 734
 
735
-<div id="outline-container-orge549942" class="outline-2">
736
-<h2 id="orge549942">Administering the system</h2>
737
-<div class="outline-text-2" id="text-orge549942">
735
+<div id="outline-container-orga6b2eee" class="outline-2">
736
+<h2 id="orga6b2eee">Administering the system</h2>
737
+<div class="outline-text-2" id="text-orga6b2eee">
738 738
 <p>
739 739
 To administer the system after installation log in via ssh, become the root user and then launch the control panel.
740 740
 </p>

+ 20
- 24
website/EN/usage.html Näytä tiedosto

@@ -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-11-17 Thu 11:03 -->
6
+<!-- 2016-11-20 Sun 17:09 -->
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>
@@ -255,15 +255,15 @@ for the JavaScript code in this tag.
255 255
 </colgroup>
256 256
 <tbody>
257 257
 <tr>
258
-<td class="org-left"><a href="#orga3d3ab6">Readme</a></td>
258
+<td class="org-left"><a href="#orgdbaccc3">Readme</a></td>
259 259
 </tr>
260 260
 
261 261
 <tr>
262
-<td class="org-left"><a href="#org5f13d98">Improving ssh security</a></td>
262
+<td class="org-left"><a href="#org9144c86">Improving ssh security</a></td>
263 263
 </tr>
264 264
 
265 265
 <tr>
266
-<td class="org-left"><a href="#org7cf8b25">Administrating the system via an onion address (Tor)</a></td>
266
+<td class="org-left"><a href="#org60b4bc6">Administrating the system via an onion address (Tor)</a></td>
267 267
 </tr>
268 268
 
269 269
 <tr>
@@ -347,7 +347,7 @@ for the JavaScript code in this tag.
347 347
 </tr>
348 348
 
349 349
 <tr>
350
-<td class="org-left"><a href="#org3910f98">Adding or removing users</a></td>
350
+<td class="org-left"><a href="#org7c0835c">Adding or removing users</a></td>
351 351
 </tr>
352 352
 
353 353
 <tr>
@@ -356,31 +356,27 @@ for the JavaScript code in this tag.
356 356
 </tbody>
357 357
 </table>
358 358
 
359
-<div id="outline-container-orga3d3ab6" class="outline-2">
360
-<h2 id="orga3d3ab6">Readme</h2>
361
-<div class="outline-text-2" id="text-orga3d3ab6">
359
+<div id="outline-container-orgdbaccc3" class="outline-2">
360
+<h2 id="orgdbaccc3">Readme</h2>
361
+<div class="outline-text-2" id="text-orgdbaccc3">
362 362
 <p>
363
-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:
363
+After the system has installed a README file will be generated which contains any advice on particular apps installed. Ordinarily you won't need to read it though. You can access it with the following commands:
364 364
 </p>
365 365
 
366 366
 <div class="org-src-container">
367 367
 <pre class="src src-bash">ssh username@domainname -p 2222
368
-emacs ~/README
368
+editor ~/README
369 369
 </pre>
370 370
 </div>
371 371
 
372 372
 <p>
373
-You should transfer any passwords to a password manager such as <a href="https://www.keepassx.org/">KeepassX</a> and then delete them from the README file. To save the file after removing passwords use <b>CTRL-x CTRL-s</b>.
374
-</p>
375
-
376
-<p>
377
-To exit you can either just close the terminal or use <b>CTRL-x CTRL-c</b> followed by the <b>exit</b> command.
373
+To exit if you're using emacs (which is the default editor, but can be changed to vim) you can either just close the terminal or use <b>CTRL-x CTRL-c</b> followed by the <b>exit</b> command.
378 374
 </p>
379 375
 </div>
380 376
 </div>
381
-<div id="outline-container-org5f13d98" class="outline-2">
382
-<h2 id="org5f13d98">Improving ssh security</h2>
383
-<div class="outline-text-2" id="text-org5f13d98">
377
+<div id="outline-container-org9144c86" class="outline-2">
378
+<h2 id="org9144c86">Improving ssh security</h2>
379
+<div class="outline-text-2" id="text-org9144c86">
384 380
 <p>
385 381
 To improve ssh security you can generate an ssh key pair on your system and then upload the public key to the Freedombone.
386 382
 </p>
@@ -430,9 +426,9 @@ If you wish to only use ssh keys then log in to the Freedombone, become the root
430 426
 </div>
431 427
 </div>
432 428
 
433
-<div id="outline-container-org7cf8b25" class="outline-2">
434
-<h2 id="org7cf8b25">Administrating the system via an onion address (Tor)</h2>
435
-<div class="outline-text-2" id="text-org7cf8b25">
429
+<div id="outline-container-org60b4bc6" class="outline-2">
430
+<h2 id="org60b4bc6">Administrating the system via an onion address (Tor)</h2>
431
+<div class="outline-text-2" id="text-org60b4bc6">
436 432
 <p>
437 433
 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:
438 434
 </p>
@@ -474,9 +470,9 @@ Subsequently even if dynamic DNS isn't working you may still be able to administ
474 470
 </p>
475 471
 </div>
476 472
 </div>
477
-<div id="outline-container-org3910f98" class="outline-2">
478
-<h2 id="org3910f98">Adding or removing users</h2>
479
-<div class="outline-text-2" id="text-org3910f98">
473
+<div id="outline-container-org7c0835c" class="outline-2">
474
+<h2 id="org7c0835c">Adding or removing users</h2>
475
+<div class="outline-text-2" id="text-org7c0835c">
480 476
 <p>
481 477
 Log into the system with:
482 478
 </p>