浏览代码

Update hashes

Bob Mottram 7 年前
父节点
当前提交
abcd167191
共有 2 个文件被更改,包括 58 次插入66 次删除
  1. 4
    8
      doc/EN/mesh.org
  2. 54
    58
      website/EN/mesh.html

+ 4
- 8
doc/EN/mesh.org 查看文件

@@ -71,7 +71,7 @@ wget https://freedombone.net/downloads/v3/freedombone-meshclient-3_all-i386.img.
71 71
 wget https://freedombone.net/downloads/v3/freedombone-meshclient-3_all-i386.img.xz.sig
72 72
 gpg --verify freedombone-meshclient-3_all-i386.img.xz.sig
73 73
 sha256sum freedombone-meshclient-3_all-i386.img.xz
74
-57e07013896503c1b0e9fee37f7cff0baa3cd98c795cb1f7209970177b7d2249
74
+74f9eaad479f84d3bf9cb002067074d35a97028145e781c5746c74577f777ee5
75 75
 unxz freedombone-meshclient-3_all-i386.img.xz
76 76
 sudo dd bs=1M if=freedombone-meshclient-3_all-i386.img of=/dev/sdX conv=fdatasync
77 77
 #+end_src
@@ -86,7 +86,7 @@ wget https://freedombone.net/downloads/v3/freedombone-meshclient-insecure-3_all-
86 86
 wget https://freedombone.net/downloads/v3/freedombone-meshclient-insecure-3_all-i386.img.xz.sig
87 87
 gpg --verify freedombone-meshclient-insecure-3_all-i386.img.xz.sig
88 88
 sha256sum freedombone-meshclient-insecure-3_all-i386.img.xz
89
-527670814d8ffd08885c5163cad85950f81abd9e819b24d3cf185e3084a6838b
89
+f1c5df24a4bfca47bd5c41dfd2568925e63a1abf83aecf0250480b4b8edc071d
90 90
 unxz freedombone-meshclient-insecure-3_all-i386.img.xz
91 91
 sudo dd bs=1M if=freedombone-meshclient-insecure-3_all-i386.img of=/dev/sdX conv=fdatasync
92 92
 #+end_src
@@ -121,16 +121,12 @@ It's better not to trust images downloaded from random places on the interwebs.
121 121
 First you will need to create an image. On a Debian based system (tested on Debian Stretch):
122 122
 
123 123
 #+begin_src bash
124
-sudo apt-get -y install build-essential libc6-dev-i386 wget \
125
-    gcc-multilib g++-multilib git python-docutils mktorrent \
126
-    vmdebootstrap xz-utils dosfstools btrfs-tools extlinux \
127
-    python-distro-info mbr qemu-user-static binfmt-support \
128
-    u-boot-tools qemu
124
+sudo apt-get -y install git wget
129 125
 wget https://freedombone.net/downloads/v3/freedombone-3.tar.gz
130 126
 wget https://freedombone.net/downloads/freedombone-3.tar.gz.sig
131 127
 gpg --verify freedombone-3.tar.gz.sig
132 128
 sha256sum freedombone-3.tar.gz
133
-328a33c6e71137ebb185328cc111b986f9a92e8080e31af9f559f9f842c9a0e5
129
+b99853322871efd298a9efd78d22323e0e7424a5cdb5097b4cc55ef45a220ebb
134 130
 tar -xzvf freedombone-3.tar.gz
135 131
 cd freedombone
136 132
 git checkout stretch

+ 54
- 58
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-03 Mon 21:02 -->
6
+<!-- 2017-07-04 Tue 10: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>
@@ -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="#orgd3bbfe1">What the system can do</a></td>
277
+<td class="org-left"><a href="#org58d57d9">What the system can do</a></td>
278 278
 <td class="org-left">-</td>
279
-<td class="org-left"><a href="#org434d1b4">Disk Images</a></td>
279
+<td class="org-left"><a href="#orgfd9bd98">Disk Images</a></td>
280 280
 <td class="org-left">-</td>
281
-<td class="org-left"><a href="#org0313155">Building Disk Images</a></td>
281
+<td class="org-left"><a href="#org211c8a0">Building Disk Images</a></td>
282 282
 <td class="org-left">-</td>
283
-<td class="org-left"><a href="#org1b24421">How to use it</a></td>
283
+<td class="org-left"><a href="#org6eec372">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-orgd3bbfe1" class="outline-2">
297
-<h2 id="orgd3bbfe1">What the system can do</h2>
298
-<div class="outline-text-2" id="text-orgd3bbfe1">
296
+<div id="outline-container-org58d57d9" class="outline-2">
297
+<h2 id="org58d57d9">What the system can do</h2>
298
+<div class="outline-text-2" id="text-org58d57d9">
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-org434d1b4" class="outline-2">
320
-<h2 id="org434d1b4">Disk Images</h2>
321
-<div class="outline-text-2" id="text-org434d1b4">
319
+<div id="outline-container-orgfd9bd98" class="outline-2">
320
+<h2 id="orgfd9bd98">Disk Images</h2>
321
+<div class="outline-text-2" id="text-orgfd9bd98">
322 322
 </div>
323
-<div id="outline-container-org6a206a6" class="outline-3">
324
-<h3 id="org6a206a6">Writing many images quickly</h3>
325
-<div class="outline-text-3" id="text-org6a206a6">
323
+<div id="outline-container-org9169486" class="outline-3">
324
+<h3 id="org9169486">Writing many images quickly</h3>
325
+<div class="outline-text-3" id="text-org9169486">
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-org386a2b4" class="outline-3">
350
-<h3 id="org386a2b4">Client images</h3>
351
-<div class="outline-text-3" id="text-org386a2b4">
349
+<div id="outline-container-orgfb36aeb" class="outline-3">
350
+<h3 id="orgfb36aeb">Client images</h3>
351
+<div class="outline-text-3" id="text-orgfb36aeb">
352 352
 <div class="org-center">
353 353
 
354 354
 <div class="figure">
@@ -367,7 +367,7 @@ wget https://freedombone.net/downloads/v3/freedombone-meshclient-3_all-i386.img.
367 367
 wget https://freedombone.net/downloads/v3/freedombone-meshclient-3_all-i386.img.xz.sig
368 368
 gpg --verify freedombone-meshclient-3_all-i386.img.xz.sig
369 369
 sha256sum freedombone-meshclient-3_all-i386.img.xz
370
-57e07013896503c1b0e9fee37f7cff0baa3cd98c795cb1f7209970177b7d2249
370
+74f9eaad479f84d3bf9cb002067074d35a97028145e781c5746c74577f777ee5
371 371
 unxz freedombone-meshclient-3_all-i386.img.xz
372 372
 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 373
 </code></pre>
@@ -387,7 +387,7 @@ wget https://freedombone.net/downloads/v3/freedombone-meshclient-insecure-3_all-
387 387
 wget https://freedombone.net/downloads/v3/freedombone-meshclient-insecure-3_all-i386.img.xz.sig
388 388
 gpg --verify freedombone-meshclient-insecure-3_all-i386.img.xz.sig
389 389
 sha256sum freedombone-meshclient-insecure-3_all-i386.img.xz
390
-527670814d8ffd08885c5163cad85950f81abd9e819b24d3cf185e3084a6838b
390
+f1c5df24a4bfca47bd5c41dfd2568925e63a1abf83aecf0250480b4b8edc071d
391 391
 unxz freedombone-meshclient-insecure-3_all-i386.img.xz
392 392
 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 393
 </code></pre>
@@ -395,16 +395,16 @@ sudo dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-n
395 395
 </div>
396 396
 </div>
397 397
 
398
-<div id="outline-container-org991e6ca" class="outline-3">
399
-<h3 id="org991e6ca">Router images</h3>
400
-<div class="outline-text-3" id="text-org991e6ca">
398
+<div id="outline-container-org01bd378" class="outline-3">
399
+<h3 id="org01bd378">Router images</h3>
400
+<div class="outline-text-3" id="text-org01bd378">
401 401
 <p>
402 402
 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 403
 </p>
404 404
 </div>
405
-<div id="outline-container-org79a4eb2" class="outline-4">
406
-<h4 id="org79a4eb2">Beaglebone Black</h4>
407
-<div class="outline-text-4" id="text-org79a4eb2">
405
+<div id="outline-container-org430cb4f" class="outline-4">
406
+<h4 id="org430cb4f">Beaglebone Black</h4>
407
+<div class="outline-text-4" id="text-org430cb4f">
408 408
 <div class="org-center">
409 409
 
410 410
 <div class="figure">
@@ -441,9 +441,9 @@ There is still a software freedom issue with the Beaglebone Black, but it doesn'
441 441
 </div>
442 442
 </div>
443 443
 
444
-<div id="outline-container-org0313155" class="outline-2">
445
-<h2 id="org0313155">Building Disk Images</h2>
446
-<div class="outline-text-2" id="text-org0313155">
444
+<div id="outline-container-org211c8a0" class="outline-2">
445
+<h2 id="org211c8a0">Building Disk Images</h2>
446
+<div class="outline-text-2" id="text-org211c8a0">
447 447
 <p>
448 448
 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 449
 </p>
@@ -453,16 +453,12 @@ First you will need to create an image. On a Debian based system (tested on Debi
453 453
 </p>
454 454
 
455 455
 <div class="org-src-container">
456
-<pre><code class="src src-bash">sudo apt-get -y install build-essential libc6-dev-i386 wget <span class="org-sh-escaped-newline">\</span>
457
-    gcc-multilib g++-multilib git python-docutils mktorrent <span class="org-sh-escaped-newline">\</span>
458
-    vmdebootstrap xz-utils dosfstools btrfs-tools extlinux <span class="org-sh-escaped-newline">\</span>
459
-    python-distro-info mbr qemu-user-static binfmt-support <span class="org-sh-escaped-newline">\</span>
460
-    u-boot-tools qemu
456
+<pre><code class="src src-bash">sudo apt-get -y install git wget
461 457
 wget https://freedombone.net/downloads/v3/freedombone-3.tar.gz
462 458
 wget https://freedombone.net/downloads/freedombone-3.tar.gz.sig
463 459
 gpg --verify freedombone-3.tar.gz.sig
464 460
 sha256sum freedombone-3.tar.gz
465
-328a33c6e71137ebb185328cc111b986f9a92e8080e31af9f559f9f842c9a0e5
461
+b99853322871efd298a9efd78d22323e0e7424a5cdb5097b4cc55ef45a220ebb
466 462
 tar -xzvf freedombone-3.tar.gz
467 463
 <span class="org-builtin">cd</span> freedombone
468 464
 git checkout stretch
@@ -534,9 +530,9 @@ The resulting image can be copied to a microSD card, inserted into a Beaglebone
534 530
 </div>
535 531
 </div>
536 532
 
537
-<div id="outline-container-org5615048" class="outline-2">
538
-<h2 id="org5615048">Customisation</h2>
539
-<div class="outline-text-2" id="text-org5615048">
533
+<div id="outline-container-org21fdea1" class="outline-2">
534
+<h2 id="org21fdea1">Customisation</h2>
535
+<div class="outline-text-2" id="text-org21fdea1">
540 536
 <p>
541 537
 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.
542 538
 </p>
@@ -546,9 +542,9 @@ If you need particular <i>dconf</i> commands to alter desktop appearance or beha
546 542
 </p>
547 543
 </div>
548 544
 </div>
549
-<div id="outline-container-org1b24421" class="outline-2">
550
-<h2 id="org1b24421">How to use it</h2>
551
-<div class="outline-text-2" id="text-org1b24421">
545
+<div id="outline-container-org6eec372" class="outline-2">
546
+<h2 id="org6eec372">How to use it</h2>
547
+<div class="outline-text-2" id="text-org6eec372">
552 548
 <p>
553 549
 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.
554 550
 </p>
@@ -558,9 +554,9 @@ After a minute or two if you are within wifi range and there is at least one oth
558 554
 </p>
559 555
 </div>
560 556
 
561
-<div id="outline-container-orga5c0f34" class="outline-3">
562
-<h3 id="orga5c0f34">Boot trouble</h3>
563
-<div class="outline-text-3" id="text-orga5c0f34">
557
+<div id="outline-container-orgf75203f" class="outline-3">
558
+<h3 id="orgf75203f">Boot trouble</h3>
559
+<div class="outline-text-3" id="text-orgf75203f">
564 560
 <p>
565 561
 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.
566 562
 </p>
@@ -570,9 +566,9 @@ After the system has booted successfully the problem should resolve itself on su
570 566
 </p>
571 567
 </div>
572 568
 </div>
573
-<div id="outline-container-org08e28e0" class="outline-3">
574
-<h3 id="org08e28e0">Set the Date</h3>
575
-<div class="outline-text-3" id="text-org08e28e0">
569
+<div id="outline-container-orgbd6243b" class="outline-3">
570
+<h3 id="orgbd6243b">Set the Date</h3>
571
+<div class="outline-text-3" id="text-orgbd6243b">
576 572
 <p>
577 573
 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.
578 574
 </p>
@@ -582,9 +578,9 @@ On the ordinary internet the date and time of your system would be set automatic
582 578
 </p>
583 579
 </div>
584 580
 </div>
585
-<div id="outline-container-org0659f7f" class="outline-3">
586
-<h3 id="org0659f7f">Check network status</h3>
587
-<div class="outline-text-3" id="text-org0659f7f">
581
+<div id="outline-container-org0dadaa3" class="outline-3">
582
+<h3 id="org0dadaa3">Check network status</h3>
583
+<div class="outline-text-3" id="text-org0dadaa3">
588 584
 <p>
589 585
 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.
590 586
 </p>
@@ -608,9 +604,9 @@ When you are finished close the window and then select the <i>Network Restart</i
608 604
 </div>
609 605
 </div>
610 606
 
611
-<div id="outline-container-orgd7cf020" class="outline-3">
612
-<h3 id="orgd7cf020">Chat System</h3>
613
-<div class="outline-text-3" id="text-orgd7cf020">
607
+<div id="outline-container-orga1e31ec" class="outline-3">
608
+<h3 id="orga1e31ec">Chat System</h3>
609
+<div class="outline-text-3" id="text-orga1e31ec">
614 610
 <p>
615 611
 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.
616 612
 </p>
@@ -669,9 +665,9 @@ At present video doesn't work reliably, but text and voice chat do work well.
669 665
 </div>
670 666
 </div>
671 667
 
672
-<div id="outline-container-orgf987ac5" class="outline-3">
673
-<h3 id="orgf987ac5">Sharing Files</h3>
674
-<div class="outline-text-3" id="text-orgf987ac5">
668
+<div id="outline-container-orgfc175ca" class="outline-3">
669
+<h3 id="orgfc175ca">Sharing Files</h3>
670
+<div class="outline-text-3" id="text-orgfc175ca">
675 671
 <p>
676 672
 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.
677 673
 </p>
@@ -686,9 +682,9 @@ You can make files publicly available on the network simply by dragging and drop
686 682
 </div>
687 683
 </div>
688 684
 
689
-<div id="outline-container-org64db4b0" class="outline-3">
690
-<h3 id="org64db4b0">Blogging</h3>
691
-<div class="outline-text-3" id="text-org64db4b0">
685
+<div id="outline-container-orgcf44e86" class="outline-3">
686
+<h3 id="orgcf44e86">Blogging</h3>
687
+<div class="outline-text-3" id="text-orgcf44e86">
692 688
 <p>
693 689
 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.
694 690
 </p>