Kaynağa Gözat

Only create a tox user on mesh clients

Bob Mottram 8 yıl önce
ebeveyn
işleme
80c3f6ef43
No account linked to committer's email
3 değiştirilmiş dosya ile 38 ekleme ve 38 silme
  1. 9
    9
      doc/EN/mesh.org
  2. 3
    3
      src/freedombone-image-mesh
  3. 26
    26
      website/EN/mesh.html

+ 9
- 9
doc/EN/mesh.org Dosyayı Görüntüle

@@ -30,7 +30,7 @@ wget https://freedombone.net/downloads/mesh-client-i386.img.xz
30 30
 wget https://freedombone.net/downloads/mesh-client-i386.img.xz.sig
31 31
 gpg --verify mesh-client-i386.img.xz.sig
32 32
 sha256sum mesh-client-i386.img.xz
33
-eaf87dcbb17b7d8328fde56005d396d423e51390e4163385c0ee8cfa0844d6f3
33
+06de9011625141188055fd87b585a0945cd5b77cf4d0ac2d080dc6ce4424a36c
34 34
 unxz mesh-client-i386.img.xz
35 35
 sudo dd bs=1M if=mesh-client-i386.img of=/dev/sdX conv=fdatasync
36 36
 #+end_src
@@ -41,13 +41,13 @@ If you're in an emergency and don't have Atheros wifi dongles then there is also
41 41
 
42 42
 #+begin_src bash
43 43
 sudo apt-get install xz-utils wget
44
-wget https://freedombone.net/downloads/mesh-client-i386-insecure.img.xz
45
-wget https://freedombone.net/downloads/mesh-client-i386-insecure.img.xz.sig
46
-gpg --verify mesh-client-i386-insecure.img.xz.sig
47
-sha256sum mesh-client-i386-insecure.img.xz
48
-2aa1552d695485505b6a145857e5cebb7dc365dbf9614488f474bf5ac1149473
49
-unxz mesh-client-i386-insecure.img.xz
50
-sudo dd bs=1M if=mesh-client-i386-insecure.img of=/dev/sdX conv=fdatasync
44
+wget https://freedombone.net/downloads/mesh-client-insecure-i386.img.xz
45
+wget https://freedombone.net/downloads/mesh-client-insecure-i386.img.xz.sig
46
+gpg --verify mesh-client-insecure-i386.img.xz.sig
47
+sha256sum mesh-client-insecure-i386.img.xz
48
+5d9108093d687c7353e078061197f5121d472ff608b60deb81a4b1c6dbfcce7b
49
+unxz mesh-client-insecure-i386.img.xz
50
+sudo dd bs=1M if=mesh-client-insecure-i386.img of=/dev/sdX conv=fdatasync
51 51
 #+end_src
52 52
 
53 53
 ** Router images
@@ -59,7 +59,7 @@ wget https://freedombone.net/downloads/mesh-router-beaglebone-black.img.xz
59 59
 wget https://freedombone.net/downloads/mesh-router-beaglebone-black.img.xz.sig
60 60
 gpg --verify mesh-router-beaglebone-black.img.xz.sig
61 61
 sha256sum mesh-router-beaglebone-black.img.xz
62
-7e90e0489eff70d7211b2b9b891ba6da20670bedbbe6db3edbb41bc54f7c8679
62
+2f01bad37a209b54a6d0f4b1a457be51aad8e9878a42c6922d33092a39ecabb7
63 63
 unxz mesh-router-beaglebone-black.img.xz
64 64
 sudo dd bs=1M if=mesh-router-beaglebone-black.img of=/dev/sdX conv=fdatasync
65 65
 #+end_src

+ 3
- 3
src/freedombone-image-mesh Dosyayı Görüntüle

@@ -470,13 +470,13 @@ function create_tox_user {
470 470
         touch /home/${MY_USERNAME}/.first_boot
471 471
     fi
472 472
 
473
-    toxid -u $MY_USERNAME -n data
474
-    chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config/tox
475
-
476 473
     if [ ! -d /home/$MY_USERNAME/Desktop ]; then
477 474
         return
478 475
     fi
479 476
 
477
+    toxid -u $MY_USERNAME -n data
478
+    chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config/tox
479
+
480 480
     chmod +x /home/$MY_USERNAME/Desktop/*.desktop
481 481
     chown ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/Desktop/*
482 482
     echo $'Created Tox user' >> $INSTALL_LOG

+ 26
- 26
website/EN/mesh.html Dosyayı Görüntüle

@@ -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-08-31 Wed 14:18 -->
6
+<!-- 2016-08-31 Wed 15:43 -->
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>
@@ -256,12 +256,12 @@ for the JavaScript code in this tag.
256 256
 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.
257 257
 </p>
258 258
 
259
-<div id="outline-container-org092f9d1" class="outline-2">
260
-<h2 id="org092f9d1">Ready made images</h2>
261
-<div class="outline-text-2" id="text-org092f9d1">
262
-</div><div id="outline-container-orgbbb82fc" class="outline-3">
263
-<h3 id="orgbbb82fc">Client images</h3>
264
-<div class="outline-text-3" id="text-orgbbb82fc">
259
+<div id="outline-container-org2ca2ea1" class="outline-2">
260
+<h2 id="org2ca2ea1">Ready made images</h2>
261
+<div class="outline-text-2" id="text-org2ca2ea1">
262
+</div><div id="outline-container-org6c5e880" class="outline-3">
263
+<h3 id="org6c5e880">Client images</h3>
264
+<div class="outline-text-3" id="text-org6c5e880">
265 265
 <p>
266 266
 "Client" isn't exactly the right term, but it's a mesh peer with a user interface. These images can be copied to a USB drive, then you can plug it into a laptop/netbook/desktop machine and boot from it. You will probably also need an Atheros USB wifi dongle, because most built-in wifi usually requires proprietary firmware. In the commands below substitute /dev/sdX with the USB drive device, excluding any trailing numbers (eg. /dev/sdb).
267 267
 </p>
@@ -290,28 +290,28 @@ If you're in an emergency and don't have Atheros wifi dongles then there is also
290 290
 <div class="org-src-container">
291 291
 
292 292
 <pre class="src src-bash">sudo apt-get install xz-utils wget
293
-wget https://freedombone.net/downloads/mesh-client-i386-insecure.img.xz
294
-wget https://freedombone.net/downloads/mesh-client-i386-insecure.img.xz.sig
295
-gpg --verify mesh-client-i386-insecure.img.xz.sig
296
-sha256sum mesh-client-i386-insecure.img.xz
297
-2aa1552d695485505b6a145857e5cebb7dc365dbf9614488f474bf5ac1149473
298
-unxz mesh-client-i386-insecure.img.xz
299
-sudo dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">if</span>=mesh-client-i386-insecure.img <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">conv</span>=fdatasync
293
+wget https://freedombone.net/downloads/mesh-client-insecure-i386.img.xz
294
+wget https://freedombone.net/downloads/mesh-client-insecure-i386.img.xz.sig
295
+gpg --verify mesh-client-insecure-i386.img.xz.sig
296
+sha256sum mesh-client-insecure-i386.img.xz
297
+5d9108093d687c7353e078061197f5121d472ff608b60deb81a4b1c6dbfcce7b
298
+unxz mesh-client-insecure-i386.img.xz
299
+sudo dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">if</span>=mesh-client-insecure-i386.img <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">conv</span>=fdatasync
300 300
 </pre>
301 301
 </div>
302 302
 </div>
303 303
 </div>
304 304
 
305
-<div id="outline-container-orge3a4e42" class="outline-3">
306
-<h3 id="orge3a4e42">Router images</h3>
307
-<div class="outline-text-3" id="text-orge3a4e42">
305
+<div id="outline-container-org67e3a98" class="outline-3">
306
+<h3 id="org67e3a98">Router images</h3>
307
+<div class="outline-text-3" id="text-org67e3a98">
308 308
 <p>
309 309
 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. 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.
310 310
 </p>
311 311
 </div>
312
-<div id="outline-container-org5ab7672" class="outline-4">
313
-<h4 id="org5ab7672">Beaglebone Black</h4>
314
-<div class="outline-text-4" id="text-org5ab7672">
312
+<div id="outline-container-org54e0719" class="outline-4">
313
+<h4 id="org54e0719">Beaglebone Black</h4>
314
+<div class="outline-text-4" id="text-org54e0719">
315 315
 <div class="org-src-container">
316 316
 
317 317
 <pre class="src src-bash">sudo apt-get install xz-utils wget
@@ -333,9 +333,9 @@ If you have a few Beaglebone Blacks to use as routers then repeat the <i>dd</i>
333 333
 </div>
334 334
 </div>
335 335
 
336
-<div id="outline-container-orgfbacb16" class="outline-2">
337
-<h2 id="orgfbacb16">To build the disk image yourself</h2>
338
-<div class="outline-text-2" id="text-orgfbacb16">
336
+<div id="outline-container-org11ba31a" class="outline-2">
337
+<h2 id="org11ba31a">To build the disk image yourself</h2>
338
+<div class="outline-text-2" id="text-org11ba31a">
339 339
 <p>
340 340
 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.
341 341
 </p>
@@ -426,9 +426,9 @@ The resulting image can be copied to a microSD card, inserted into a Beaglebone
426 426
 </div>
427 427
 </div>
428 428
 
429
-<div id="outline-container-orgb1a953b" class="outline-2">
430
-<h2 id="orgb1a953b">How to use it</h2>
431
-<div class="outline-text-2" id="text-orgb1a953b">
429
+<div id="outline-container-orgba0cf51" class="outline-2">
430
+<h2 id="orgba0cf51">How to use it</h2>
431
+<div class="outline-text-2" id="text-orgba0cf51">
432 432
 <p>
433 433
 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.
434 434
 </p>