Bob Mottram пре 7 година
родитељ
комит
c44743a509
4 измењених фајлова са 61 додато и 53 уклоњено
  1. 1
    0
      doc/EN/homeserver.org
  2. 3
    0
      doc/EN/mesh.org
  3. 3
    2
      website/EN/homeserver.html
  4. 54
    51
      website/EN/mesh.html

+ 1
- 0
doc/EN/homeserver.org Прегледај датотеку

@@ -74,6 +74,7 @@ Now plug in the USB thumb drive, and do the same again. Notice which drive lette
74 74
 You can now copy the image to the USB thumb drive, replacing *sdX* with the identifier of the USB thumb drive. Don't include any numbers (so for example use *sdc* instead of *sdc1*).
75 75
 
76 76
 #+begin_src bash
77
+dd if=/dev/zero of=/dev/sdX bs=1M count=8
77 78
 dd bs=1M if=myimagefile.img of=/dev/sdX conv=fdatasync
78 79
 #+end_src
79 80
 

+ 3
- 0
doc/EN/mesh.org Прегледај датотеку

@@ -73,6 +73,7 @@ gpg --verify freedombone-meshclient-3_all-i386.img.xz.sig
73 73
 sha256sum freedombone-meshclient-3_all-i386.img.xz
74 74
 74f9eaad479f84d3bf9cb002067074d35a97028145e781c5746c74577f777ee5
75 75
 unxz freedombone-meshclient-3_all-i386.img.xz
76
+sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8
76 77
 sudo dd bs=1M if=freedombone-meshclient-3_all-i386.img of=/dev/sdX conv=fdatasync
77 78
 #+end_src
78 79
 
@@ -88,6 +89,7 @@ gpg --verify freedombone-meshclient-insecure-3_all-i386.img.xz.sig
88 89
 sha256sum freedombone-meshclient-insecure-3_all-i386.img.xz
89 90
 f1c5df24a4bfca47bd5c41dfd2568925e63a1abf83aecf0250480b4b8edc071d
90 91
 unxz freedombone-meshclient-insecure-3_all-i386.img.xz
92
+sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8
91 93
 sudo dd bs=1M if=freedombone-meshclient-insecure-3_all-i386.img of=/dev/sdX conv=fdatasync
92 94
 #+end_src
93 95
 
@@ -154,6 +156,7 @@ Now plug in the USB thumb drive, and do the same again. Notice which drive lette
154 156
 You can now copy the image to the USB thumb drive, replacing *sdX* with the identifier of the USB thumb drive. Don't include any numbers (so for example use *sdc* instead of *sdc1*).
155 157
 
156 158
 #+begin_src bash
159
+sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8
157 160
 sudo dd bs=1M if=myimagefile.img of=/dev/sdX conv=fdatasync
158 161
 #+end_src
159 162
 

+ 3
- 2
website/EN/homeserver.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
-<!-- 2017-09-12 Tue 10:06 -->
6
+<!-- 2017-09-15 Fri 22:17 -->
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>
@@ -340,7 +340,8 @@ You can now copy the image to the USB thumb drive, replacing <b>sdX</b> with the
340 340
 </p>
341 341
 
342 342
 <div class="org-src-container">
343
-<pre><code class="src src-bash">dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">if</span>=myimagefile.img <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">conv</span>=fdatasync
343
+<pre><code class="src src-bash">dd <span class="org-variable-name">if</span>=/dev/zero <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">count</span>=8
344
+dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">if</span>=myimagefile.img <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">conv</span>=fdatasync
344 345
 </code></pre>
345 346
 </div>
346 347
 

+ 54
- 51
website/EN/mesh.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
-<!-- 2017-07-04 Tue 10:14 -->
6
+<!-- 2017-09-15 Fri 22:19 -->
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>
@@ -274,13 +274,13 @@ for the JavaScript code in this tag.
274 274
 </colgroup>
275 275
 <tbody>
276 276
 <tr>
277
-<td class="org-left"><a href="#org43720c8">What the system can do</a></td>
277
+<td class="org-left"><a href="#orgc6406cc">What the system can do</a></td>
278 278
 <td class="org-left">-</td>
279
-<td class="org-left"><a href="#orgf236d1b">Disk Images</a></td>
279
+<td class="org-left"><a href="#orgf24c15c">Disk Images</a></td>
280 280
 <td class="org-left">-</td>
281
-<td class="org-left"><a href="#org3279497">Building Disk Images</a></td>
281
+<td class="org-left"><a href="#org08c02eb">Building Disk Images</a></td>
282 282
 <td class="org-left">-</td>
283
-<td class="org-left"><a href="#org52b6ecb">How to use it</a></td>
283
+<td class="org-left"><a href="#orgfce6a77">How to use it</a></td>
284 284
 </tr>
285 285
 </tbody>
286 286
 </table>
@@ -293,9 +293,9 @@ The Freedombone Mesh is a wireless solution for autonomous communication that ca
293 293
 Mesh networks are useful as a quick way to make a fully decentralised communications system which is not connected to or reliant upon the internet. Think festivals, hacker conferences, onboard ships at sea, disaster/war zones, small business internal office communications, protests, remote areas of the world, temporary "digital blackouts", scientific expeditions and off-world space colonies. The down side is that you can't access any internet content. The upside is that you can securely communicate with anyone on the local mesh. No ISPs. No payments or subscriptions beyond the cost of obtaining the hardware. Systems need to be within wifi range of each other for the mesh to be created. It can be an ultra-convenient way to do purely local communications.
294 294
 </p>
295 295
 
296
-<div id="outline-container-org43720c8" class="outline-2">
297
-<h2 id="org43720c8">What the system can do</h2>
298
-<div class="outline-text-2" id="text-org43720c8">
296
+<div id="outline-container-orgc6406cc" class="outline-2">
297
+<h2 id="orgc6406cc">What the system can do</h2>
298
+<div class="outline-text-2" id="text-orgc6406cc">
299 299
 <ul class="org-ul">
300 300
 <li>Discovery of other users on the network</li>
301 301
 <li>Text based chat, one-to-one and in groups</li>
@@ -316,13 +316,13 @@ This system should be quite scalable. Both qTox and IPFS are based upon distribu
316 316
 </div>
317 317
 </div>
318 318
 
319
-<div id="outline-container-orgf236d1b" class="outline-2">
320
-<h2 id="orgf236d1b">Disk Images</h2>
321
-<div class="outline-text-2" id="text-orgf236d1b">
319
+<div id="outline-container-orgf24c15c" class="outline-2">
320
+<h2 id="orgf24c15c">Disk Images</h2>
321
+<div class="outline-text-2" id="text-orgf24c15c">
322 322
 </div>
323
-<div id="outline-container-org84d3aa9" class="outline-3">
324
-<h3 id="org84d3aa9">Writing many images quickly</h3>
325
-<div class="outline-text-3" id="text-org84d3aa9">
323
+<div id="outline-container-org88842fc" class="outline-3">
324
+<h3 id="org88842fc">Writing many images quickly</h3>
325
+<div class="outline-text-3" id="text-org88842fc">
326 326
 <p>
327 327
 There may be situations where you need to write the same disk image to multiple drives at the same time in order to maximize rate of deployment. In the instructions given below the <b>dd</b> command is used for writing to the target drive, but to write to multiple drives you can use a tool such as <a href="https://wiki.gnome.org/Apps/MultiWriter">GNOME MultiWriter</a>.
328 328
 </p>
@@ -346,9 +346,9 @@ Or on Debian based systems:
346 346
 </div>
347 347
 </div>
348 348
 </div>
349
-<div id="outline-container-orga950e86" class="outline-3">
350
-<h3 id="orga950e86">Client images</h3>
351
-<div class="outline-text-3" id="text-orga950e86">
349
+<div id="outline-container-org4a8b638" class="outline-3">
350
+<h3 id="org4a8b638">Client images</h3>
351
+<div class="outline-text-3" id="text-org4a8b638">
352 352
 <div class="org-center">
353 353
 
354 354
 <div class="figure">
@@ -369,6 +369,7 @@ gpg --verify freedombone-meshclient-3_all-i386.img.xz.sig
369 369
 sha256sum freedombone-meshclient-3_all-i386.img.xz
370 370
 74f9eaad479f84d3bf9cb002067074d35a97028145e781c5746c74577f777ee5
371 371
 unxz freedombone-meshclient-3_all-i386.img.xz
372
+sudo dd <span class="org-variable-name">if</span>=/dev/zero <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">count</span>=8
372 373
 sudo dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">if</span>=freedombone-meshclient-3_all-i386.img <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">conv</span>=fdatasync
373 374
 </code></pre>
374 375
 </div>
@@ -389,22 +390,23 @@ gpg --verify freedombone-meshclient-insecure-3_all-i386.img.xz.sig
389 390
 sha256sum freedombone-meshclient-insecure-3_all-i386.img.xz
390 391
 f1c5df24a4bfca47bd5c41dfd2568925e63a1abf83aecf0250480b4b8edc071d
391 392
 unxz freedombone-meshclient-insecure-3_all-i386.img.xz
393
+sudo dd <span class="org-variable-name">if</span>=/dev/zero <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">count</span>=8
392 394
 sudo dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">if</span>=freedombone-meshclient-insecure-3_all-i386.img <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">conv</span>=fdatasync
393 395
 </code></pre>
394 396
 </div>
395 397
 </div>
396 398
 </div>
397 399
 
398
-<div id="outline-container-org7a83803" class="outline-3">
399
-<h3 id="org7a83803">Router images</h3>
400
-<div class="outline-text-3" id="text-org7a83803">
400
+<div id="outline-container-org519744c" class="outline-3">
401
+<h3 id="org519744c">Router images</h3>
402
+<div class="outline-text-3" id="text-org519744c">
401 403
 <p>
402 404
 Routers are intended to build network coverage for an area using small and low cost hardware. You can bolt them to walls or leave them on window ledges. They don't have any user interface and their only job is to haul network traffic across the mesh and to enable peers to find each other via running bootstrap nodes for Tox and IPFS. Copy the image to a microSD card and insert it into the router, plug in an Atheros wifi dongle and power on. That should be all you need to do.
403 405
 </p>
404 406
 </div>
405
-<div id="outline-container-orgff96209" class="outline-4">
406
-<h4 id="orgff96209">Beaglebone Black</h4>
407
-<div class="outline-text-4" id="text-orgff96209">
407
+<div id="outline-container-org909807a" class="outline-4">
408
+<h4 id="org909807a">Beaglebone Black</h4>
409
+<div class="outline-text-4" id="text-org909807a">
408 410
 <div class="org-center">
409 411
 
410 412
 <div class="figure">
@@ -441,9 +443,9 @@ There is still a software freedom issue with the Beaglebone Black, but it doesn'
441 443
 </div>
442 444
 </div>
443 445
 
444
-<div id="outline-container-org3279497" class="outline-2">
445
-<h2 id="org3279497">Building Disk Images</h2>
446
-<div class="outline-text-2" id="text-org3279497">
446
+<div id="outline-container-org08c02eb" class="outline-2">
447
+<h2 id="org08c02eb">Building Disk Images</h2>
448
+<div class="outline-text-2" id="text-org08c02eb">
447 449
 <p>
448 450
 It's better not to trust images downloaded from random places on the interwebs. Chances are that unless you are in the web of trust of the above GPG signatures then they don't mean very much to you. If you actually want something trustworthy then build the images from scratch. It will take some time. Here's how to do it.
449 451
 </p>
@@ -499,7 +501,8 @@ You can now copy the image to the USB thumb drive, replacing <b>sdX</b> with the
499 501
 </p>
500 502
 
501 503
 <div class="org-src-container">
502
-<pre><code class="src src-bash">sudo dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">if</span>=myimagefile.img <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">conv</span>=fdatasync
504
+<pre><code class="src src-bash">sudo dd <span class="org-variable-name">if</span>=/dev/zero <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">count</span>=8
505
+sudo dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">if</span>=myimagefile.img <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">conv</span>=fdatasync
503 506
 </code></pre>
504 507
 </div>
505 508
 
@@ -530,9 +533,9 @@ The resulting image can be copied to a microSD card, inserted into a Beaglebone
530 533
 </div>
531 534
 </div>
532 535
 
533
-<div id="outline-container-org8da4b39" class="outline-2">
534
-<h2 id="org8da4b39">Customisation</h2>
535
-<div class="outline-text-2" id="text-org8da4b39">
536
+<div id="outline-container-org0dec35a" class="outline-2">
537
+<h2 id="org0dec35a">Customisation</h2>
538
+<div class="outline-text-2" id="text-org0dec35a">
536 539
 <p>
537 540
 If you want to make your own specially branded version, such as for a particular event, then to change the default desktop backgrounds edit the images within <b>img/backgrounds</b> and to change the available avatars and desktop icons edit the images within <b>img/avatars</b>. Re-create disk images using the instructions shown previously.
538 541
 </p>
@@ -542,9 +545,9 @@ If you need particular <i>dconf</i> commands to alter desktop appearance or beha
542 545
 </p>
543 546
 </div>
544 547
 </div>
545
-<div id="outline-container-org52b6ecb" class="outline-2">
546
-<h2 id="org52b6ecb">How to use it</h2>
547
-<div class="outline-text-2" id="text-org52b6ecb">
548
+<div id="outline-container-orgfce6a77" class="outline-2">
549
+<h2 id="orgfce6a77">How to use it</h2>
550
+<div class="outline-text-2" id="text-orgfce6a77">
548 551
 <p>
549 552
 When you first boot from the USB drive the system will create some encryption keys, assign a unique network address to the system and then reboot itself. When that's done you should see a prompt asking for a username. This username just makes it easy for others to initially find you on the mesh and will appear in the list of users.
550 553
 </p>
@@ -554,9 +557,9 @@ After a minute or two if you are within wifi range and there is at least one oth
554 557
 </p>
555 558
 </div>
556 559
 
557
-<div id="outline-container-org218c967" class="outline-3">
558
-<h3 id="org218c967">Boot trouble</h3>
559
-<div class="outline-text-3" id="text-org218c967">
560
+<div id="outline-container-org2a6eb8c" class="outline-3">
561
+<h3 id="org2a6eb8c">Boot trouble</h3>
562
+<div class="outline-text-3" id="text-org2a6eb8c">
560 563
 <p>
561 564
 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.
562 565
 </p>
@@ -566,9 +569,9 @@ After the system has booted successfully the problem should resolve itself on su
566 569
 </p>
567 570
 </div>
568 571
 </div>
569
-<div id="outline-container-org6c9bd07" class="outline-3">
570
-<h3 id="org6c9bd07">Set the Date</h3>
571
-<div class="outline-text-3" id="text-org6c9bd07">
572
+<div id="outline-container-org92cd6d5" class="outline-3">
573
+<h3 id="org92cd6d5">Set the Date</h3>
574
+<div class="outline-text-3" id="text-org92cd6d5">
572 575
 <p>
573 576
 On the ordinary internet the date and time of your system would be set automatically via NTP. But this is not the internet and so you will need to manually ensure that your date and time settings are correct. You might need to periodically do this if your clock drifts. It's not essential that the time on your system be highly accurate, but if it drifts too far or goes back to epoch then things could become a little confusing in regard to the order of blog posts.
574 577
 </p>
@@ -578,9 +581,9 @@ On the ordinary internet the date and time of your system would be set automatic
578 581
 </p>
579 582
 </div>
580 583
 </div>
581
-<div id="outline-container-org351f6a2" class="outline-3">
582
-<h3 id="org351f6a2">Check network status</h3>
583
-<div class="outline-text-3" id="text-org351f6a2">
584
+<div id="outline-container-org2aa12f0" class="outline-3">
585
+<h3 id="org2aa12f0">Check network status</h3>
586
+<div class="outline-text-3" id="text-org2aa12f0">
584 587
 <p>
585 588
 Unlike with ordinary wifi, on the mesh you don't get a signal strength icon and so it's not simple to see if you have a good connection.
586 589
 </p>
@@ -604,9 +607,9 @@ When you are finished close the window and then select the <i>Network Restart</i
604 607
 </div>
605 608
 </div>
606 609
 
607
-<div id="outline-container-org90f8f7b" class="outline-3">
608
-<h3 id="org90f8f7b">Chat System</h3>
609
-<div class="outline-text-3" id="text-org90f8f7b">
610
+<div id="outline-container-org2f1dfa6" class="outline-3">
611
+<h3 id="org2f1dfa6">Chat System</h3>
612
+<div class="outline-text-3" id="text-org2f1dfa6">
610 613
 <p>
611 614
 Ensure that you're within wifi range of at least one other mesh peer (could be a router or client) and then you should see that the <i>Chat</i> and <i>Other Users</i> icons appear. Select the users icon and you should see a list of users on the mesh. Select the <i>Chat</i> icon and once you are connected you should see the status light turn green. If after a few minutes you don't get the green status light then try closing and re-opening the Tox chat application. Select the plus button to add a friend and then copy and paste in a Tox ID from the users list.
612 615
 </p>
@@ -665,9 +668,9 @@ At present video doesn't work reliably, but text and voice chat do work well.
665 668
 </div>
666 669
 </div>
667 670
 
668
-<div id="outline-container-orgb0ff834" class="outline-3">
669
-<h3 id="orgb0ff834">Sharing Files</h3>
670
-<div class="outline-text-3" id="text-orgb0ff834">
671
+<div id="outline-container-org75993b2" class="outline-3">
672
+<h3 id="org75993b2">Sharing Files</h3>
673
+<div class="outline-text-3" id="text-org75993b2">
671 674
 <p>
672 675
 You can make files publicly available on the network simply by dragging and dropping them into the <i>Public</i> folder on the desktop. To view the files belonging to another user select the desktop icon called <i>Visit a site</i> and enter the username or Tox ID of the other user.
673 676
 </p>
@@ -682,9 +685,9 @@ You can make files publicly available on the network simply by dragging and drop
682 685
 </div>
683 686
 </div>
684 687
 
685
-<div id="outline-container-org9f54fb7" class="outline-3">
686
-<h3 id="org9f54fb7">Blogging</h3>
687
-<div class="outline-text-3" id="text-org9f54fb7">
688
+<div id="outline-container-org86cab79" class="outline-3">
689
+<h3 id="org86cab79">Blogging</h3>
690
+<div class="outline-text-3" id="text-org86cab79">
688 691
 <p>
689 692
 To create a blog post select the <i>Blog</i> icon on the desktop and then use the up and down cursor keys, space bar and enter key to add a new entry. Edit the title of the entry and add your text. You can also include photos if you wish - just copy them to the <b>CreateBlog/content/images</b> directory and then link to them as shown.
690 693
 </p>