Просмотр исходного кода

Since it looks like Conversations will be dropping OTR

Bob Mottram 7 лет назад
Родитель
Сommit
3eac53cb2f

+ 1
- 1
doc/EN/app_gnusocial.org Просмотреть файл

20
 
20
 
21
 You can host your own GNU Social instance and then "/remote follow/" other users who may also be doing the same. With a federated structure this type of system is hard to censor or ban. Unlike Twitter, there are no bribed adverts pushed into your stream, and any trends happening are likely to be real rather than being manipulated by some opaque algorithm.
21
 You can host your own GNU Social instance and then "/remote follow/" other users who may also be doing the same. With a federated structure this type of system is hard to censor or ban. Unlike Twitter, there are no bribed adverts pushed into your stream, and any trends happening are likely to be real rather than being manipulated by some opaque algorithm.
22
 
22
 
23
-You should regard anything posted to GNU Social as being /public communication/ visible to anyone on the internet. There is a direct messaging capability between users but it's not particularly secure, so for one-to-one messages stick to better methods, such as XMPP with OTR/OMEMO or Tox.
23
+You should regard anything posted to GNU Social as being /public communication/ visible to anyone on the internet. There is a direct messaging capability between users but it's not particularly secure, so for one-to-one messages stick to better methods, such as XMPP with OpenPGP/OMEMO or Tox.
24
 
24
 
25
 Some general advice about life in the fediverse [[./fediverse.html][can be found here]].
25
 Some general advice about life in the fediverse [[./fediverse.html][can be found here]].
26
 
26
 

+ 1
- 1
doc/EN/backups.org Просмотреть файл

68
 * Distributed/remote backups
68
 * Distributed/remote backups
69
 Distributed backups are a better way of ensuring the persistence of your data, such that even if your system gets stolen or destroyed then the data will still be recoverable from your friends. Since the backups are encrypted your friends (or anyone else with access to their systems) won't be able to read your backed up content even if their systems are subsequently compromised.
69
 Distributed backups are a better way of ensuring the persistence of your data, such that even if your system gets stolen or destroyed then the data will still be recoverable from your friends. Since the backups are encrypted your friends (or anyone else with access to their systems) won't be able to read your backed up content even if their systems are subsequently compromised.
70
 
70
 
71
-Firstly you will need to have a user account on one or more of your friends servers.  They don't necessarily need to be using Freedombone, just some version of GNU/Linux with ssh access.  They can create a user account for you with the control panel on a Freedombone system or with the *adduser <username>* command on any other system when logged in as root and then give you the username and password via a secure method, such as on paper, via an encrypted email, Tox or via an XMPP chat using OTR. Make sure that the password used is a strong one - preferably a long random string stored in a password manager - so that dictionary attacks will not be easy. Also for maximum resilience put your password manager file onto a USB thumb drive and carry it with you.
71
+Firstly you will need to have a user account on one or more of your friends servers.  They don't necessarily need to be using Freedombone, just some version of GNU/Linux with ssh access.  They can create a user account for you with the control panel on a Freedombone system or with the *adduser <username>* command on any other system when logged in as root and then give you the username and password via a secure method, such as on paper, via an encrypted email, Tox or via an XMPP chat using OpenPGP/OMEMO. Make sure that the password used is a strong one - preferably a long random string stored in a password manager - so that dictionary attacks will not be easy. Also for maximum resilience put your password manager file onto a USB thumb drive and carry it with you.
72
 
72
 
73
 #+BEGIN_SRC bash
73
 #+BEGIN_SRC bash
74
 ssh username@domainname -p 2222
74
 ssh username@domainname -p 2222

+ 1
- 1
doc/EN/codeofconduct.org Просмотреть файл

46
 
46
 
47
 Serious or persistent offenders will be kicked from chat rooms and any of their subsequent patches will be unlikely to be upstreamed. In this context "serious" means that someone is causing others to feel unsafe or be unable to contribute, for whatever reason.
47
 Serious or persistent offenders will be kicked from chat rooms and any of their subsequent patches will be unlikely to be upstreamed. In this context "serious" means that someone is causing others to feel unsafe or be unable to contribute, for whatever reason.
48
 
48
 
49
-This is not a big project and so there is no division of labor or special enforcement committee or bureaucratic process. Complaints should be made (in private) to the maintainer or chat room admin. The typical email address can be found in the source code headers. Preferably use GPG/OpenPGP if you can, or XMPP with OTR/OMEMO to bob@freedombone.net. XMPP messages are likely to get a quicker response.
49
+This is not a big project and so there is no division of labor or special enforcement committee or bureaucratic process. Complaints should be made (in private) to the maintainer or chat room admin. The typical email address can be found in the source code headers. Preferably use GPG if you can, or XMPP with OpenPGP/OMEMO to bob@freedombone.net. XMPP messages are likely to get a quicker response.

+ 1
- 1
doc/EN/support.org Просмотреть файл

24
 
24
 
25
 *PGP/GPG Fingerprint:* 9ABB82C00ABF39F82680487DCC2536191FA7C33F
25
 *PGP/GPG Fingerprint:* 9ABB82C00ABF39F82680487DCC2536191FA7C33F
26
 
26
 
27
-*XMPP:* bob@freedombone.net with OMEMO or OTR
27
+*XMPP:* bob@freedombone.net with OMEMO or OpenPGP
28
 
28
 
29
 *Matrix:* #fbone:matrix.freedombone.net
29
 *Matrix:* #fbone:matrix.freedombone.net
30
 
30
 

+ 24
- 24
website/EN/app_gnusocial.html Просмотреть файл

3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5
 <head>
5
 <head>
6
-<!-- 2017-05-09 Tue 15:00 -->
6
+<!-- 2018-02-20 Tue 10:55 -->
7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9
-<title></title>
9
+<title>&lrm;</title>
10
 <meta name="generator" content="Org mode" />
10
 <meta name="generator" content="Org mode" />
11
 <meta name="author" content="Bob Mottram" />
11
 <meta name="author" content="Bob Mottram" />
12
 <meta name="description" content="How to use GNU Social"
12
 <meta name="description" content="How to use GNU Social"
257
 </p>
257
 </p>
258
 
258
 
259
 <p>
259
 <p>
260
-You should regard anything posted to GNU Social as being <i>public communication</i> visible to anyone on the internet. There is a direct messaging capability between users but it's not particularly secure, so for one-to-one messages stick to better methods, such as XMPP with OTR/OMEMO or Tox.
260
+You should regard anything posted to GNU Social as being <i>public communication</i> visible to anyone on the internet. There is a direct messaging capability between users but it's not particularly secure, so for one-to-one messages stick to better methods, such as XMPP with OpenPGP/OMEMO or Tox.
261
 </p>
261
 </p>
262
 
262
 
263
 <p>
263
 <p>
274
 </div>
274
 </div>
275
 
275
 
276
 
276
 
277
-<div id="outline-container-org5123b46" class="outline-2">
278
-<h2 id="org5123b46">Installation</h2>
279
-<div class="outline-text-2" id="text-org5123b46">
277
+<div id="outline-container-orgd505b7e" class="outline-2">
278
+<h2 id="orgd505b7e">Installation</h2>
279
+<div class="outline-text-2" id="text-orgd505b7e">
280
 <p>
280
 <p>
281
 Log into your system with:
281
 Log into your system with:
282
 </p>
282
 </p>
283
 
283
 
284
 <div class="org-src-container">
284
 <div class="org-src-container">
285
-<pre><code class="src src-bash">ssh myusername@mydomain -p 2222
286
-</code></pre>
285
+<pre class="src src-bash">ssh myusername@mydomain -p 2222
286
+</pre>
287
 </div>
287
 </div>
288
 
288
 
289
 <p>
289
 <p>
300
 </div>
300
 </div>
301
 </div>
301
 </div>
302
 
302
 
303
-<div id="outline-container-org9477256" class="outline-2">
304
-<h2 id="org9477256">Initial setup</h2>
305
-<div class="outline-text-2" id="text-org9477256">
303
+<div id="outline-container-org23e7827" class="outline-2">
304
+<h2 id="org23e7827">Initial setup</h2>
305
+<div class="outline-text-2" id="text-org23e7827">
306
 <p>
306
 <p>
307
 If you have just obtained a Lets Encrypt certificate as above then go to <b>About</b> on the administrator control panel and you should see your GNU Social domain listed there along with an onion address. You can then navigate to your site in a browser.
307
 If you have just obtained a Lets Encrypt certificate as above then go to <b>About</b> on the administrator control panel and you should see your GNU Social domain listed there along with an onion address. You can then navigate to your site in a browser.
308
 </p>
308
 </p>
329
 </div>
329
 </div>
330
 </div>
330
 </div>
331
 
331
 
332
-<div id="outline-container-org3314c00" class="outline-2">
333
-<h2 id="org3314c00">Switching user interfaces</h2>
334
-<div class="outline-text-2" id="text-org3314c00">
332
+<div id="outline-container-orge65b439" class="outline-2">
333
+<h2 id="orge65b439">Switching user interfaces</h2>
334
+<div class="outline-text-2" id="text-orge65b439">
335
 <p>
335
 <p>
336
 A few web based user interfaces are available for GNU SOcial. They are selectable by going to the <b>Administrator control panel</b> and choosing <b>App settings</b> then <b>gnusocial</b>.
336
 A few web based user interfaces are available for GNU SOcial. They are selectable by going to the <b>Administrator control panel</b> and choosing <b>App settings</b> then <b>gnusocial</b>.
337
 </p>
337
 </p>
352
 </div>
352
 </div>
353
 </div>
353
 </div>
354
 
354
 
355
-<div id="outline-container-org52974f0" class="outline-2">
356
-<h2 id="org52974f0">Using with Emacs</h2>
357
-<div class="outline-text-2" id="text-org52974f0">
355
+<div id="outline-container-org6444239" class="outline-2">
356
+<h2 id="org6444239">Using with Emacs</h2>
357
+<div class="outline-text-2" id="text-org6444239">
358
 <div class="org-center">
358
 <div class="org-center">
359
 
359
 
360
 <div class="figure">
360
 <div class="figure">
368
 </p>
368
 </p>
369
 
369
 
370
 <div class="org-src-container">
370
 <div class="org-src-container">
371
-<pre><code class="src src-bash">mkdir ~/elisp
371
+<pre class="src src-bash">mkdir ~/elisp
372
 git clone https://github.com/bashrc/gnu-social-mode ~/elisp/gnu-social-mode
372
 git clone https://github.com/bashrc/gnu-social-mode ~/elisp/gnu-social-mode
373
 <span class="org-builtin">echo</span> <span class="org-string">"(add-to-list 'load-path \"~/elisp/gnu-social-mode\")"</span> &gt;&gt; ~/.emacs
373
 <span class="org-builtin">echo</span> <span class="org-string">"(add-to-list 'load-path \"~/elisp/gnu-social-mode\")"</span> &gt;&gt; ~/.emacs
374
 <span class="org-builtin">echo</span> <span class="org-string">"(require 'gnu-social-mode)"</span> &gt;&gt; ~/.emacs
374
 <span class="org-builtin">echo</span> <span class="org-string">"(require 'gnu-social-mode)"</span> &gt;&gt; ~/.emacs
376
 <span class="org-builtin">echo</span> <span class="org-string">"      gnu-social-server \"yourgnusocialdomain\""</span> &gt;&gt; ~/.emacs
376
 <span class="org-builtin">echo</span> <span class="org-string">"      gnu-social-server \"yourgnusocialdomain\""</span> &gt;&gt; ~/.emacs
377
 <span class="org-builtin">echo</span> <span class="org-string">"    gnu-social-username \"yourusername\""</span> &gt;&gt; ~/.emacs
377
 <span class="org-builtin">echo</span> <span class="org-string">"    gnu-social-username \"yourusername\""</span> &gt;&gt; ~/.emacs
378
 <span class="org-builtin">echo</span> <span class="org-string">"    gnu-social-password \"gnusocialpassword\")"</span> &gt;&gt; ~/.emacs
378
 <span class="org-builtin">echo</span> <span class="org-string">"    gnu-social-password \"gnusocialpassword\")"</span> &gt;&gt; ~/.emacs
379
-</code></pre>
379
+</pre>
380
 </div>
380
 </div>
381
 
381
 
382
 <p>
382
 <p>
384
 </p>
384
 </p>
385
 
385
 
386
 <div class="org-src-container">
386
 <div class="org-src-container">
387
-<pre><code class="src src-bash">M-x gnu-social
388
-</code></pre>
387
+<pre class="src src-bash">M-x gnu-social
388
+</pre>
389
 </div>
389
 </div>
390
 
390
 
391
 <p>
391
 <p>
535
 </div>
535
 </div>
536
 </div>
536
 </div>
537
 
537
 
538
-<div id="outline-container-orgd6dab31" class="outline-2">
539
-<h2 id="orgd6dab31">Blocking controls</h2>
540
-<div class="outline-text-2" id="text-orgd6dab31">
538
+<div id="outline-container-org231ba8e" class="outline-2">
539
+<h2 id="org231ba8e">Blocking controls</h2>
540
+<div class="outline-text-2" id="text-org231ba8e">
541
 <div class="org-center">
541
 <div class="org-center">
542
 
542
 
543
 <div class="figure">
543
 <div class="figure">

+ 32
- 30
website/EN/backups.html Просмотреть файл

3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5
 <head>
5
 <head>
6
-<!-- 2016-10-31 Mon 16:23 -->
6
+<!-- 2018-02-20 Tue 11:20 -->
7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9
-<title></title>
9
+<title>&lrm;</title>
10
 <meta name="generator" content="Org mode" />
10
 <meta name="generator" content="Org mode" />
11
 <meta name="author" content="Bob Mottram" />
11
 <meta name="author" content="Bob Mottram" />
12
 <meta name="description" content="Turn the Beaglebone Black into a personal communications server"
12
 <meta name="description" content="Turn the Beaglebone Black into a personal communications server"
71
   pre.src-fortran:before { content: 'Fortran'; }
71
   pre.src-fortran:before { content: 'Fortran'; }
72
   pre.src-gnuplot:before { content: 'gnuplot'; }
72
   pre.src-gnuplot:before { content: 'gnuplot'; }
73
   pre.src-haskell:before { content: 'Haskell'; }
73
   pre.src-haskell:before { content: 'Haskell'; }
74
+  pre.src-hledger:before { content: 'hledger'; }
74
   pre.src-java:before { content: 'Java'; }
75
   pre.src-java:before { content: 'Java'; }
75
   pre.src-js:before { content: 'Javascript'; }
76
   pre.src-js:before { content: 'Javascript'; }
76
   pre.src-latex:before { content: 'LaTeX'; }
77
   pre.src-latex:before { content: 'LaTeX'; }
188
 @licstart  The following is the entire license notice for the
189
 @licstart  The following is the entire license notice for the
189
 JavaScript code in this tag.
190
 JavaScript code in this tag.
190
 
191
 
191
-Copyright (C) 2012-2013 Free Software Foundation, Inc.
192
+Copyright (C) 2012-2017 Free Software Foundation, Inc.
192
 
193
 
193
 The JavaScript code in this tag is free software: you can
194
 The JavaScript code in this tag is free software: you can
194
 redistribute it and/or modify it under the terms of the GNU
195
 redistribute it and/or modify it under the terms of the GNU
256
 </colgroup>
257
 </colgroup>
257
 <tbody>
258
 <tbody>
258
 <tr>
259
 <tr>
259
-<td class="org-left"><a href="#org5101793">Backup keys</a></td>
260
+<td class="org-left"><a href="#org9e30c71">Backup keys</a></td>
260
 </tr>
261
 </tr>
261
 
262
 
262
 <tr>
263
 <tr>
263
-<td class="org-left"><a href="#orgbd04f75">Backup to USB</a></td>
264
+<td class="org-left"><a href="#org51128a3">Backup to USB</a></td>
264
 </tr>
265
 </tr>
265
 
266
 
266
 <tr>
267
 <tr>
267
-<td class="org-left"><a href="#org3944959">Restore from USB</a></td>
268
+<td class="org-left"><a href="#org471bcb9">Restore from USB</a></td>
268
 </tr>
269
 </tr>
269
 
270
 
270
 <tr>
271
 <tr>
271
-<td class="org-left"><a href="#org4ffab21">Distributed/remote backups</a></td>
272
+<td class="org-left"><a href="#orgbd325f2">Distributed/remote backups</a></td>
272
 </tr>
273
 </tr>
273
 
274
 
274
 <tr>
275
 <tr>
275
-<td class="org-left"><a href="#org52a7ed8">Restore from a friend</a></td>
276
+<td class="org-left"><a href="#orged9af55">Restore from a friend</a></td>
276
 </tr>
277
 </tr>
277
 </tbody>
278
 </tbody>
278
 </table>
279
 </table>
279
 </div>
280
 </div>
280
 
281
 
281
-<div id="outline-container-org5101793" class="outline-2">
282
-<h2 id="org5101793">Backup keys</h2>
283
-<div class="outline-text-2" id="text-org5101793">
282
+<div id="outline-container-org9e30c71" class="outline-2">
283
+<h2 id="org9e30c71">Backup keys</h2>
284
+<div class="outline-text-2" id="text-org9e30c71">
284
 <p>
285
 <p>
285
 As part of the Freedombone installation the GPG key used to encrypt backups will have been added to the <i>.gnupg</i> keyring in your home directory. Ensure that you have a copy of all your keys by plugging in a LUKS encrypted USB drive and then running the commands:
286
 As part of the Freedombone installation the GPG key used to encrypt backups will have been added to the <i>.gnupg</i> keyring in your home directory. Ensure that you have a copy of all your keys by plugging in a LUKS encrypted USB drive and then running the commands:
286
 </p>
287
 </p>
303
 </p>
304
 </p>
304
 </div>
305
 </div>
305
 </div>
306
 </div>
306
-<div id="outline-container-orgbd04f75" class="outline-2">
307
-<h2 id="orgbd04f75">Backup to USB</h2>
308
-<div class="outline-text-2" id="text-orgbd04f75">
307
+<div id="outline-container-org51128a3" class="outline-2">
308
+<h2 id="org51128a3">Backup to USB</h2>
309
+<div class="outline-text-2" id="text-org51128a3">
309
 <p>
310
 <p>
310
 First and foremost - <b>encrypt your USB drives</b>! Even if you think you have "<i>nothing to hide</i>" if you accidentally lose a USB thumb drive (it's easy to lose small objects) and it's not encrypted then potentially someone might be able to obtain enough information about you to commit identity fraud, take out loans, open bank accounts, etc. Use LUKS encryption. In Ubuntu you can do this using the <i>Disk Utility</i> application. Some instructions <a href="https://help.ubuntu.com/community/EncryptedFilesystemsOnRemovableStorage">can be found here</a>.
311
 First and foremost - <b>encrypt your USB drives</b>! Even if you think you have "<i>nothing to hide</i>" if you accidentally lose a USB thumb drive (it's easy to lose small objects) and it's not encrypted then potentially someone might be able to obtain enough information about you to commit identity fraud, take out loans, open bank accounts, etc. Use LUKS encryption. In Ubuntu you can do this using the <i>Disk Utility</i> application. Some instructions <a href="https://help.ubuntu.com/community/EncryptedFilesystemsOnRemovableStorage">can be found here</a>.
311
 </p>
312
 </p>
336
 </p>
337
 </p>
337
 </div>
338
 </div>
338
 </div>
339
 </div>
339
-<div id="outline-container-org3944959" class="outline-2">
340
-<h2 id="org3944959">Restore from USB</h2>
341
-<div class="outline-text-2" id="text-org3944959">
340
+<div id="outline-container-org471bcb9" class="outline-2">
341
+<h2 id="org471bcb9">Restore from USB</h2>
342
+<div class="outline-text-2" id="text-org471bcb9">
342
 <p>
343
 <p>
343
 Log into the system and become the root user:
344
 Log into the system and become the root user:
344
 </p>
345
 </p>
361
 </p>
362
 </p>
362
 </div>
363
 </div>
363
 </div>
364
 </div>
364
-<div id="outline-container-org4ffab21" class="outline-2">
365
-<h2 id="org4ffab21">Distributed/remote backups</h2>
366
-<div class="outline-text-2" id="text-org4ffab21">
365
+<div id="outline-container-orgbd325f2" class="outline-2">
366
+<h2 id="orgbd325f2">Distributed/remote backups</h2>
367
+<div class="outline-text-2" id="text-orgbd325f2">
367
 <p>
368
 <p>
368
 Distributed backups are a better way of ensuring the persistence of your data, such that even if your system gets stolen or destroyed then the data will still be recoverable from your friends. Since the backups are encrypted your friends (or anyone else with access to their systems) won't be able to read your backed up content even if their systems are subsequently compromised.
369
 Distributed backups are a better way of ensuring the persistence of your data, such that even if your system gets stolen or destroyed then the data will still be recoverable from your friends. Since the backups are encrypted your friends (or anyone else with access to their systems) won't be able to read your backed up content even if their systems are subsequently compromised.
369
 </p>
370
 </p>
370
 
371
 
371
 <p>
372
 <p>
372
-Firstly you will need to have a user account on one or more of your friends servers.  They don't necessarily need to be using Freedombone, just some version of GNU/Linux with ssh access.  They can create a user account for you with the control panel on a Freedombone system or with the <b>adduser &lt;username&gt;</b> command on any other system when logged in as root and then give you the username and password via a secure method, such as on paper, via an encrypted email, Tox or via an XMPP chat using OTR. Make sure that the password used is a strong one - preferably a long random string stored in a password manager - so that dictionary attacks will not be easy. Also for maximum resilience put your password manager file onto a USB thumb drive and carry it with you.
373
+Firstly you will need to have a user account on one or more of your friends servers.  They don't necessarily need to be using Freedombone, just some version of GNU/Linux with ssh access.  They can create a user account for you with the control panel on a Freedombone system or with the <b>adduser &lt;username&gt;</b> command on any other system when logged in as root and then give you the username and password via a secure method, such as on paper, via an encrypted email, Tox or via an XMPP chat using OpenPGP/OMEMO. Make sure that the password used is a strong one - preferably a long random string stored in a password manager - so that dictionary attacks will not be easy. Also for maximum resilience put your password manager file onto a USB thumb drive and carry it with you.
373
 </p>
374
 </p>
374
 
375
 
375
 <div class="org-src-container">
376
 <div class="org-src-container">
386
 </p>
387
 </p>
387
 </div>
388
 </div>
388
 </div>
389
 </div>
389
-<div id="outline-container-org52a7ed8" class="outline-2">
390
-<h2 id="org52a7ed8">Restore from a friend</h2>
391
-<div class="outline-text-2" id="text-org52a7ed8">
392
-</div><div id="outline-container-org9783b56" class="outline-3">
393
-<h3 id="org9783b56">With a completely new Freedombone installation</h3>
394
-<div class="outline-text-3" id="text-org9783b56">
390
+<div id="outline-container-orged9af55" class="outline-2">
391
+<h2 id="orged9af55">Restore from a friend</h2>
392
+<div class="outline-text-2" id="text-orged9af55">
393
+</div>
394
+<div id="outline-container-orgf5b5789" class="outline-3">
395
+<h3 id="orgf5b5789">With a completely new Freedombone installation</h3>
396
+<div class="outline-text-3" id="text-orgf5b5789">
395
 <p>
397
 <p>
396
 This is the ultimate disaster recovery scenario in which you are beginning completely from scratch with new hardware and a new Freedombone installation (configured with the same username and domain names). It is assumed that the old hardware was destroyed, but that you have the backup key stored on a USB thumb drive.
398
 This is the ultimate disaster recovery scenario in which you are beginning completely from scratch with new hardware and a new Freedombone installation (configured with the same username and domain names). It is assumed that the old hardware was destroyed, but that you have the backup key stored on a USB thumb drive.
397
 </p>
399
 </p>
418
 </p>
420
 </p>
419
 </div>
421
 </div>
420
 </div>
422
 </div>
421
-<div id="outline-container-orgf7adedb" class="outline-3">
422
-<h3 id="orgf7adedb">On an existing Freedombone installation</h3>
423
-<div class="outline-text-3" id="text-orgf7adedb">
423
+<div id="outline-container-orgda018d1" class="outline-3">
424
+<h3 id="orgda018d1">On an existing Freedombone installation</h3>
425
+<div class="outline-text-3" id="text-orgda018d1">
424
 <p>
426
 <p>
425
 This is for more common situations in which maybe some data became corrupted and you want to restore it.
427
 This is for more common situations in which maybe some data became corrupted and you want to restore it.
426
 </p>
428
 </p>

+ 20
- 20
website/EN/codeofconduct.html Просмотреть файл

3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5
 <head>
5
 <head>
6
-<!-- 2017-12-29 Fri 10:25 -->
6
+<!-- 2018-02-20 Tue 11:21 -->
7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9
 <title>&lrm;</title>
9
 <title>&lrm;</title>
246
 
246
 
247
 <center><h1>Code of Conduct</h1></center>
247
 <center><h1>Code of Conduct</h1></center>
248
 
248
 
249
-<div id="outline-container-org7389049" class="outline-2">
250
-<h2 id="org7389049">Be respectful</h2>
251
-<div class="outline-text-2" id="text-org7389049">
249
+<div id="outline-container-org52494ee" class="outline-2">
250
+<h2 id="org52494ee">Be respectful</h2>
251
+<div class="outline-text-2" id="text-org52494ee">
252
 <p>
252
 <p>
253
 In any Free Software project with more than one participant inevitably there may be people with whom you may disagree, or find it difficult to cooperate. Accept that, but even so, remain respectful. Disagreement is no excuse for poor behaviour or personal attacks, and a community in which people feel threatened is not a healthy community.
253
 In any Free Software project with more than one participant inevitably there may be people with whom you may disagree, or find it difficult to cooperate. Accept that, but even so, remain respectful. Disagreement is no excuse for poor behaviour or personal attacks, and a community in which people feel threatened is not a healthy community.
254
 </p>
254
 </p>
255
 </div>
255
 </div>
256
 </div>
256
 </div>
257
 
257
 
258
-<div id="outline-container-orgb4a8701" class="outline-2">
259
-<h2 id="orgb4a8701">Assume good faith</h2>
260
-<div class="outline-text-2" id="text-orgb4a8701">
258
+<div id="outline-container-orgf45c2d3" class="outline-2">
259
+<h2 id="orgf45c2d3">Assume good faith</h2>
260
+<div class="outline-text-2" id="text-orgf45c2d3">
261
 <p>
261
 <p>
262
 Freedombone Contributors have many ways of reaching our common goal of providing freedom respecting internet or mesh systems which may differ from your ways. Assume that other people are working towards this goal.
262
 Freedombone Contributors have many ways of reaching our common goal of providing freedom respecting internet or mesh systems which may differ from your ways. Assume that other people are working towards this goal.
263
 </p>
263
 </p>
264
 </div>
264
 </div>
265
 </div>
265
 </div>
266
 
266
 
267
-<div id="outline-container-org323e1d5" class="outline-2">
268
-<h2 id="org323e1d5">Be collaborative</h2>
269
-<div class="outline-text-2" id="text-org323e1d5">
267
+<div id="outline-container-org2cd0532" class="outline-2">
268
+<h2 id="org2cd0532">Be collaborative</h2>
269
+<div class="outline-text-2" id="text-org2cd0532">
270
 <p>
270
 <p>
271
 Freedombone is a moderately complex project, though nothing big and professional like GNU. It's good to ask for help when you need it. Similarly, offers for help should be seen in the context of our shared goal of improving the system.
271
 Freedombone is a moderately complex project, though nothing big and professional like GNU. It's good to ask for help when you need it. Similarly, offers for help should be seen in the context of our shared goal of improving the system.
272
 </p>
272
 </p>
277
 </div>
277
 </div>
278
 </div>
278
 </div>
279
 
279
 
280
-<div id="outline-container-org2247eb7" class="outline-2">
281
-<h2 id="org2247eb7">Try to be concise</h2>
282
-<div class="outline-text-2" id="text-org2247eb7">
280
+<div id="outline-container-orgbc9ebe6" class="outline-2">
281
+<h2 id="orgbc9ebe6">Try to be concise</h2>
282
+<div class="outline-text-2" id="text-orgbc9ebe6">
283
 <p>
283
 <p>
284
 If you're submitting documentation then keep in mind that what you write once could be read by many other people. To avoid TL;DR keep it as short and concise as possible. This will also reduce the amount of translations effort needed.
284
 If you're submitting documentation then keep in mind that what you write once could be read by many other people. To avoid TL;DR keep it as short and concise as possible. This will also reduce the amount of translations effort needed.
285
 </p>
285
 </p>
290
 </div>
290
 </div>
291
 </div>
291
 </div>
292
 
292
 
293
-<div id="outline-container-org9d2afa5" class="outline-2">
294
-<h2 id="org9d2afa5">Be open</h2>
295
-<div class="outline-text-2" id="text-org9d2afa5">
293
+<div id="outline-container-org9cc58e7" class="outline-2">
294
+<h2 id="org9cc58e7">Be open</h2>
295
+<div class="outline-text-2" id="text-org9cc58e7">
296
 <p>
296
 <p>
297
 Most ways of communication used within Freedombone (eg Matrix/XMPP) allow for public and private communication. Prefer public methods of communication for Freedombone-related messages, unless posting something sensitive.
297
 Most ways of communication used within Freedombone (eg Matrix/XMPP) allow for public and private communication. Prefer public methods of communication for Freedombone-related messages, unless posting something sensitive.
298
 </p>
298
 </p>
303
 </div>
303
 </div>
304
 </div>
304
 </div>
305
 
305
 
306
-<div id="outline-container-orgeac99f0" class="outline-2">
307
-<h2 id="orgeac99f0">In case of problems</h2>
308
-<div class="outline-text-2" id="text-orgeac99f0">
306
+<div id="outline-container-orgcc0a62b" class="outline-2">
307
+<h2 id="orgcc0a62b">In case of problems</h2>
308
+<div class="outline-text-2" id="text-orgcc0a62b">
309
 <p>
309
 <p>
310
 While this code of conduct should be adhered to by participants, we recognize that sometimes people may have a bad day, or be unaware of some of the guidelines in this code of conduct. When that happens, you may reply to them and point out this code of conduct. Such messages may be in public or in private, whatever is most appropriate. However, regardless of whether the message is public or not, it should still adhere to the relevant parts of this code of conduct; in particular, it should not be abusive or disrespectful. Assume good faith; it is more likely that participants are unaware of their bad behaviour than that they intentionally try to degrade the quality of the discussion.
310
 While this code of conduct should be adhered to by participants, we recognize that sometimes people may have a bad day, or be unaware of some of the guidelines in this code of conduct. When that happens, you may reply to them and point out this code of conduct. Such messages may be in public or in private, whatever is most appropriate. However, regardless of whether the message is public or not, it should still adhere to the relevant parts of this code of conduct; in particular, it should not be abusive or disrespectful. Assume good faith; it is more likely that participants are unaware of their bad behaviour than that they intentionally try to degrade the quality of the discussion.
311
 </p>
311
 </p>
315
 </p>
315
 </p>
316
 
316
 
317
 <p>
317
 <p>
318
-This is not a big project and so there is no division of labor or special enforcement committee or bureaucratic process. Complaints should be made (in private) to the maintainer or chat room admin. The typical email address can be found in the source code headers. Preferably use GPG/OpenPGP if you can, or XMPP with OTR/OMEMO to bob@freedombone.net. XMPP messages are likely to get a quicker response.
318
+This is not a big project and so there is no division of labor or special enforcement committee or bureaucratic process. Complaints should be made (in private) to the maintainer or chat room admin. The typical email address can be found in the source code headers. Preferably use GPG if you can, or XMPP with OpenPGP/OMEMO to bob@freedombone.net. XMPP messages are likely to get a quicker response.
319
 </p>
319
 </p>
320
 </div>
320
 </div>
321
 </div>
321
 </div>

+ 32
- 32
website/EN/support.html Просмотреть файл

3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5
 <head>
5
 <head>
6
-<!-- 2018-02-04 Sun 21:22 -->
6
+<!-- 2018-02-20 Tue 11:19 -->
7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9
 <title>&lrm;</title>
9
 <title>&lrm;</title>
248
 <h1>Support</h1>
248
 <h1>Support</h1>
249
 </center>
249
 </center>
250
 
250
 
251
-<div id="outline-container-orgbc8f3ea" class="outline-2">
252
-<h2 id="orgbc8f3ea">Contact details</h2>
253
-<div class="outline-text-2" id="text-orgbc8f3ea">
251
+<div id="outline-container-org96625f0" class="outline-2">
252
+<h2 id="org96625f0">Contact details</h2>
253
+<div class="outline-text-2" id="text-org96625f0">
254
 <p>
254
 <p>
255
 This site can also be accessed via a Tor browser at <b><a href="http://yjxlc3imv7obva4grjae6u3qw527koaytrgjgdp364hmthrst3jodiid.onion">http://yjxlc3imv7obva4grjae6u3qw527koaytrgjgdp364hmthrst3jodiid.onion</a></b>
255
 This site can also be accessed via a Tor browser at <b><a href="http://yjxlc3imv7obva4grjae6u3qw527koaytrgjgdp364hmthrst3jodiid.onion">http://yjxlc3imv7obva4grjae6u3qw527koaytrgjgdp364hmthrst3jodiid.onion</a></b>
256
 </p>
256
 </p>
264
 </p>
264
 </p>
265
 
265
 
266
 <p>
266
 <p>
267
-<b>XMPP:</b> bob@freedombone.net with OMEMO or OTR
267
+<b>XMPP:</b> bob@freedombone.net with OMEMO or OpenPGP
268
 </p>
268
 </p>
269
 
269
 
270
 <p>
270
 <p>
277
 </div>
277
 </div>
278
 </div>
278
 </div>
279
 
279
 
280
-<div id="outline-container-org742c05a" class="outline-2">
281
-<h2 id="org742c05a">Things which would be nice to have</h2>
282
-<div class="outline-text-2" id="text-org742c05a">
280
+<div id="outline-container-orgf7837ec" class="outline-2">
281
+<h2 id="orgf7837ec">Things which would be nice to have</h2>
282
+<div class="outline-text-2" id="text-orgf7837ec">
283
 </div>
283
 </div>
284
-<div id="outline-container-org317c742" class="outline-3">
285
-<h3 id="org317c742">Ideas</h3>
286
-<div class="outline-text-3" id="text-org317c742">
284
+<div id="outline-container-orgff56304" class="outline-3">
285
+<h3 id="orgff56304">Ideas</h3>
286
+<div class="outline-text-3" id="text-orgff56304">
287
 <p>
287
 <p>
288
 Know of some fabulous web system which could run on Freedombone, but currently doesn't? Contact the above, and be prepared to make a compelling argument for why it should be included.
288
 Know of some fabulous web system which could run on Freedombone, but currently doesn't? Contact the above, and be prepared to make a compelling argument for why it should be included.
289
 </p>
289
 </p>
290
 </div>
290
 </div>
291
 </div>
291
 </div>
292
 
292
 
293
-<div id="outline-container-orgafbb438" class="outline-3">
294
-<h3 id="orgafbb438">Money</h3>
295
-<div class="outline-text-3" id="text-orgafbb438">
293
+<div id="outline-container-org2a3b4c0" class="outline-3">
294
+<h3 id="org2a3b4c0">Money</h3>
295
+<div class="outline-text-3" id="text-org2a3b4c0">
296
 <p>
296
 <p>
297
 At the present time this project is not seeking any funding. There is no crowdfunding campaign and no slick marketing video. Those aren't ruled out as future possibilities, but for now they're just not needed.
297
 At the present time this project is not seeking any funding. There is no crowdfunding campaign and no slick marketing video. Those aren't ruled out as future possibilities, but for now they're just not needed.
298
 </p>
298
 </p>
303
 </div>
303
 </div>
304
 </div>
304
 </div>
305
 
305
 
306
-<div id="outline-container-org2edf966" class="outline-3">
307
-<h3 id="org2edf966">Testing and reporting bugs</h3>
308
-<div class="outline-text-3" id="text-org2edf966">
306
+<div id="outline-container-org0aab630" class="outline-3">
307
+<h3 id="org0aab630">Testing and reporting bugs</h3>
308
+<div class="outline-text-3" id="text-org0aab630">
309
 <p>
309
 <p>
310
 Testing of the install on different hardware. Also pentesting on test installations to find vulnerabilities.
310
 Testing of the install on different hardware. Also pentesting on test installations to find vulnerabilities.
311
 </p>
311
 </p>
312
 </div>
312
 </div>
313
 </div>
313
 </div>
314
 
314
 
315
-<div id="outline-container-org10bcaa2" class="outline-3">
316
-<h3 id="org10bcaa2">Web design and artwork</h3>
317
-<div class="outline-text-3" id="text-org10bcaa2">
315
+<div id="outline-container-org9f29739" class="outline-3">
316
+<h3 id="org9f29739">Web design and artwork</h3>
317
+<div class="outline-text-3" id="text-org9f29739">
318
 <p>
318
 <p>
319
 A better design for this website would be nice to have. Photos, icons or other artwork are all welcome. I've always liked the cartoon artwork of the <a href="https://www.mediagoblin.org/">Mediagoblin</a> project, and attractive graphics can help to get people initially interested.
319
 A better design for this website would be nice to have. Photos, icons or other artwork are all welcome. I've always liked the cartoon artwork of the <a href="https://www.mediagoblin.org/">Mediagoblin</a> project, and attractive graphics can help to get people initially interested.
320
 </p>
320
 </p>
321
 </div>
321
 </div>
322
 </div>
322
 </div>
323
 
323
 
324
-<div id="outline-container-org881c8f8" class="outline-3">
325
-<h3 id="org881c8f8">Howto videos</h3>
326
-<div class="outline-text-3" id="text-org881c8f8">
324
+<div id="outline-container-org73db84c" class="outline-3">
325
+<h3 id="org73db84c">Howto videos</h3>
326
+<div class="outline-text-3" id="text-org73db84c">
327
 <p>
327
 <p>
328
 If you're good at making videos then a howto for installing Freedombone onto various types of hardware, or testing the mesh system in realistic/exotic scenarios would be good. You could even host videos on PeerTube or Mediagoblin.
328
 If you're good at making videos then a howto for installing Freedombone onto various types of hardware, or testing the mesh system in realistic/exotic scenarios would be good. You could even host videos on PeerTube or Mediagoblin.
329
 </p>
329
 </p>
330
 </div>
330
 </div>
331
 </div>
331
 </div>
332
-<div id="outline-container-org237516c" class="outline-3">
333
-<h3 id="org237516c">More education and promotion</h3>
334
-<div class="outline-text-3" id="text-org237516c">
332
+<div id="outline-container-org34d84b9" class="outline-3">
333
+<h3 id="org34d84b9">More education and promotion</h3>
334
+<div class="outline-text-3" id="text-org34d84b9">
335
 <div class="org-center">
335
 <div class="org-center">
336
 
336
 
337
 <div class="figure">
337
 <div class="figure">
349
 </div>
349
 </div>
350
 </div>
350
 </div>
351
 
351
 
352
-<div id="outline-container-org92766d9" class="outline-3">
353
-<h3 id="org92766d9">Translations</h3>
354
-<div class="outline-text-3" id="text-org92766d9">
352
+<div id="outline-container-orgb28d5fb" class="outline-3">
353
+<h3 id="orgb28d5fb">Translations</h3>
354
+<div class="outline-text-3" id="text-orgb28d5fb">
355
 <p>
355
 <p>
356
 To add translations modify the json files within the <b>locale</b> subdirectory. Then make a pull request on the <a href="https://github.com/bashrc/freedombone">Github site</a>.
356
 To add translations modify the json files within the <b>locale</b> subdirectory. Then make a pull request on the <a href="https://github.com/bashrc/freedombone">Github site</a>.
357
 </p>
357
 </p>
358
 </div>
358
 </div>
359
 </div>
359
 </div>
360
 
360
 
361
-<div id="outline-container-orgaf00625" class="outline-3">
362
-<h3 id="orgaf00625">Packaging</h3>
363
-<div class="outline-text-3" id="text-orgaf00625">
361
+<div id="outline-container-org6dfbb85" class="outline-3">
362
+<h3 id="org6dfbb85">Packaging</h3>
363
+<div class="outline-text-3" id="text-org6dfbb85">
364
 <p>
364
 <p>
365
 Helping to package GNU Social and Hubzilla for Debian would be beneficial.
365
 Helping to package GNU Social and Hubzilla for Debian would be beneficial.
366
 </p>
366
 </p>