Bob Mottram преди 9 години
родител
ревизия
360c2a5f30
променени са 2 файла, в които са добавени 50 реда и са изтрити 60 реда
  1. 1
    3
      doc/EN/installation.org
  2. 49
    57
      website/EN/installation.html

+ 1
- 3
doc/EN/installation.org Целия файл

@@ -18,7 +18,7 @@
18 18
 
19 19
 | [[Building an image for a Single Board Computer or Virtual Machine]] |
20 20
 | [[Checklist]]                                                        |
21
-| [[Mesh network]]                                                     |
21
+| [[./mesh.html][Mesh network]]                                                     |
22 22
 | [[Installation]]                                                     |
23 23
 | [[Social Key Management - the 'Unforgettable Key']]                  |
24 24
 | [[Final Setup]]                                                      |
@@ -80,8 +80,6 @@ Before installing Freedombone you will need a few things.
80 80
   * Ethernet connection between the system and your internet router
81 81
   * That it is possible to forward ports from the internet router to the system, typically via firewall settings
82 82
   * Have ssh access to the system, typically via fbone@freedombone.local on port 2222
83
-* Mesh network
84
-If you are installing one of the mesh network variants then see [[./mesh.html][these instructions]] for details.
85 83
 * Installation
86 84
 There are three install options: Laptop/Desktop/Netbook, SBC and Virtual Machine.
87 85
 

+ 49
- 57
website/EN/installation.html Целия файл

@@ -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
-<!-- 2015-12-18 Fri 22:18 -->
6
+<!-- 2015-12-18 Fri 22:53 -->
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>
@@ -176,31 +176,31 @@ for the JavaScript code in this tag.
176 176
 </tr>
177 177
 
178 178
 <tr>
179
-<td class="org-left"><a href="#orgheadline3">Mesh network</a></td>
179
+<td class="org-left"><a href="./mesh.html">Mesh network</a></td>
180 180
 </tr>
181 181
 
182 182
 <tr>
183
-<td class="org-left"><a href="#orgheadline4">Installation</a></td>
183
+<td class="org-left"><a href="#orgheadline3">Installation</a></td>
184 184
 </tr>
185 185
 
186 186
 <tr>
187
-<td class="org-left"><a href="#orgheadline5">Social Key Management - the 'Unforgettable Key'</a></td>
187
+<td class="org-left"><a href="#orgheadline4">Social Key Management - the 'Unforgettable Key'</a></td>
188 188
 </tr>
189 189
 
190 190
 <tr>
191
-<td class="org-left"><a href="#orgheadline6">Final Setup</a></td>
191
+<td class="org-left"><a href="#orgheadline5">Final Setup</a></td>
192 192
 </tr>
193 193
 
194 194
 <tr>
195
-<td class="org-left"><a href="#orgheadline7">Keydrives</a></td>
195
+<td class="org-left"><a href="#orgheadline6">Keydrives</a></td>
196 196
 </tr>
197 197
 
198 198
 <tr>
199
-<td class="org-left"><a href="#orgheadline8">On Client Machines</a></td>
199
+<td class="org-left"><a href="#orgheadline7">On Client Machines</a></td>
200 200
 </tr>
201 201
 
202 202
 <tr>
203
-<td class="org-left"><a href="#orgheadline9">Administering the system</a></td>
203
+<td class="org-left"><a href="#orgheadline8">Administering the system</a></td>
204 204
 </tr>
205 205
 </tbody>
206 206
 </table>
@@ -300,24 +300,16 @@ Before installing Freedombone you will need a few things.
300 300
 </div>
301 301
 </div>
302 302
 <div id="outline-container-orgheadline3" class="outline-2">
303
-<h2 id="orgheadline3">Mesh network</h2>
303
+<h2 id="orgheadline3">Installation</h2>
304 304
 <div class="outline-text-2" id="text-orgheadline3">
305 305
 <p>
306
-If you are installing one of the mesh network variants then see <a href="./mesh.html">these instructions</a> for details.
307
-</p>
308
-</div>
309
-</div>
310
-<div id="outline-container-orgheadline4" class="outline-2">
311
-<h2 id="orgheadline4">Installation</h2>
312
-<div class="outline-text-2" id="text-orgheadline4">
313
-<p>
314 306
 There are three install options: Laptop/Desktop/Netbook, SBC and Virtual Machine.
315 307
 </p>
316 308
 </div>
317 309
 
318
-<div id="outline-container-orgheadline10" class="outline-3">
319
-<h3 id="orgheadline10">On a Laptop, Netbook or Desktop machine</h3>
320
-<div class="outline-text-3" id="text-orgheadline10">
310
+<div id="outline-container-orgheadline9" class="outline-3">
311
+<h3 id="orgheadline9">On a Laptop, Netbook or Desktop machine</h3>
312
+<div class="outline-text-3" id="text-orgheadline9">
321 313
 <p>
322 314
 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:
323 315
 </p>
@@ -336,9 +328,9 @@ freedombone menuconfig
336 328
 </div>
337 329
 </div>
338 330
 
339
-<div id="outline-container-orgheadline11" class="outline-3">
340
-<h3 id="orgheadline11">On a single board computer (SBC)</h3>
341
-<div class="outline-text-3" id="text-orgheadline11">
331
+<div id="outline-container-orgheadline10" class="outline-3">
332
+<h3 id="orgheadline10">On a single board computer (SBC)</h3>
333
+<div class="outline-text-3" id="text-orgheadline10">
342 334
 <p>
343 335
 Currently the following boards are supported:
344 336
 </p>
@@ -420,9 +412,9 @@ Using the password 'freedombone'. Take a note of the new login password and then
420 412
 </div>
421 413
 </div>
422 414
 
423
-<div id="outline-container-orgheadline12" class="outline-3">
424
-<h3 id="orgheadline12">As a Virtual Machine</h3>
425
-<div class="outline-text-3" id="text-orgheadline12">
415
+<div id="outline-container-orgheadline11" class="outline-3">
416
+<h3 id="orgheadline11">As a Virtual Machine</h3>
417
+<div class="outline-text-3" id="text-orgheadline11">
426 418
 <p>
427 419
 Virtualbox and Qemu are supported. You can run a 64 bit Qemu image with:
428 420
 </p>
@@ -444,42 +436,42 @@ The default login will be username 'fbone' and password 'freedombone'. Take a no
444 436
 </div>
445 437
 </div>
446 438
 
447
-<div id="outline-container-orgheadline5" class="outline-2">
448
-<h2 id="orgheadline5">Social Key Management - the 'Unforgettable Key'</h2>
449
-<div class="outline-text-2" id="text-orgheadline5">
439
+<div id="outline-container-orgheadline4" class="outline-2">
440
+<h2 id="orgheadline4">Social Key Management - the 'Unforgettable Key'</h2>
441
+<div class="outline-text-2" id="text-orgheadline4">
450 442
 <p>
451 443
 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
452 444
 </p>
453 445
 </div>
454 446
 
455
-<div id="outline-container-orgheadline13" class="outline-3">
456
-<h3 id="orgheadline13">You have the gnupg keyring on an encrypted USB drive</h3>
457
-<div class="outline-text-3" id="text-orgheadline13">
447
+<div id="outline-container-orgheadline12" class="outline-3">
448
+<h3 id="orgheadline12">You have the gnupg keyring on an encrypted USB drive</h3>
449
+<div class="outline-text-3" id="text-orgheadline12">
458 450
 <p>
459 451
 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.
460 452
 </p>
461 453
 </div>
462 454
 </div>
463
-<div id="outline-container-orgheadline14" class="outline-3">
464
-<h3 id="orgheadline14">You have a number of key fragments on USB drives retrieved from friends</h3>
465
-<div class="outline-text-3" id="text-orgheadline14">
455
+<div id="outline-container-orgheadline13" class="outline-3">
456
+<h3 id="orgheadline13">You have a number of key fragments on USB drives retrieved from friends</h3>
457
+<div class="outline-text-3" id="text-orgheadline13">
466 458
 <p>
467
-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="#orgheadline7">Keydrives</a>.
459
+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="#orgheadline6">Keydrives</a>.
468 460
 </p>
469 461
 </div>
470 462
 </div>
471
-<div id="outline-container-orgheadline15" class="outline-3">
472
-<h3 id="orgheadline15">You can specify some ssh login details for friends servers containing key fragments</h3>
473
-<div class="outline-text-3" id="text-orgheadline15">
463
+<div id="outline-container-orgheadline14" class="outline-3">
464
+<h3 id="orgheadline14">You can specify some ssh login details for friends servers containing key fragments</h3>
465
+<div class="outline-text-3" id="text-orgheadline14">
474 466
 <p>
475 467
 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.
476 468
 </p>
477 469
 </div>
478 470
 </div>
479 471
 </div>
480
-<div id="outline-container-orgheadline6" class="outline-2">
481
-<h2 id="orgheadline6">Final Setup</h2>
482
-<div class="outline-text-2" id="text-orgheadline6">
472
+<div id="outline-container-orgheadline5" class="outline-2">
473
+<h2 id="orgheadline5">Final Setup</h2>
474
+<div class="outline-text-2" id="text-orgheadline5">
483 475
 <p>
484 476
 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.
485 477
 </p>
@@ -602,16 +594,16 @@ On your internet router, typically under firewall settings, open the following p
602 594
 </div>
603 595
 </div>
604 596
 
605
-<div id="outline-container-orgheadline7" class="outline-2">
606
-<h2 id="orgheadline7">Keydrives</h2>
607
-<div class="outline-text-2" id="text-orgheadline7">
597
+<div id="outline-container-orgheadline6" class="outline-2">
598
+<h2 id="orgheadline6">Keydrives</h2>
599
+<div class="outline-text-2" id="text-orgheadline6">
608 600
 <p>
609 601
 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:
610 602
 </p>
611 603
 </div>
612
-<div id="outline-container-orgheadline16" class="outline-3">
613
-<h3 id="orgheadline16">Master Keydrive</h3>
614
-<div class="outline-text-3" id="text-orgheadline16">
604
+<div id="outline-container-orgheadline15" class="outline-3">
605
+<h3 id="orgheadline15">Master Keydrive</h3>
606
+<div class="outline-text-3" id="text-orgheadline15">
615 607
 <p>
616 608
 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:
617 609
 </p>
@@ -628,9 +620,9 @@ Select <i>Backup and Restore</i> then <i>Backup GPG key to USB (master keydrive)
628 620
 </p>
629 621
 </div>
630 622
 </div>
631
-<div id="outline-container-orgheadline17" class="outline-3">
632
-<h3 id="orgheadline17">Fragment keydrives</h3>
633
-<div class="outline-text-3" id="text-orgheadline17">
623
+<div id="outline-container-orgheadline16" class="outline-3">
624
+<h3 id="orgheadline16">Fragment keydrives</h3>
625
+<div class="outline-text-3" id="text-orgheadline16">
634 626
 <p>
635 627
 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:
636 628
 </p>
@@ -652,9 +644,9 @@ Fragments are randomly assigned and so you will need at least three or four keyd
652 644
 </div>
653 645
 </div>
654 646
 </div>
655
-<div id="outline-container-orgheadline8" class="outline-2">
656
-<h2 id="orgheadline8">On Client Machines</h2>
657
-<div class="outline-text-2" id="text-orgheadline8">
647
+<div id="outline-container-orgheadline7" class="outline-2">
648
+<h2 id="orgheadline7">On Client Machines</h2>
649
+<div class="outline-text-2" id="text-orgheadline7">
658 650
 <p>
659 651
 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.
660 652
 </p>
@@ -672,9 +664,9 @@ freedombone-client
672 664
 </div>
673 665
 </div>
674 666
 
675
-<div id="outline-container-orgheadline9" class="outline-2">
676
-<h2 id="orgheadline9">Administering the system</h2>
677
-<div class="outline-text-2" id="text-orgheadline9">
667
+<div id="outline-container-orgheadline8" class="outline-2">
668
+<h2 id="orgheadline8">Administering the system</h2>
669
+<div class="outline-text-2" id="text-orgheadline8">
678 670
 <p>
679 671
 To administer the system after installation log in via ssh, become the root user and then launch the control panel.
680 672
 </p>