Bob Mottram 9 年前
父节点
当前提交
4bb01d598b
共有 6 个文件被更改,包括 76 次插入52 次删除
  1. 1
    1
      README.md
  2. 1
    1
      doc/EN/usage.org
  3. 1
    1
      doc/EN/variants.org
  4. 二进制
      man/freedombone.1.gz
  5. 71
    47
      website/EN/usage.html
  6. 2
    2
      website/EN/variants.html

+ 1
- 1
README.md 查看文件

@@ -3,7 +3,7 @@
3 3
 The Freedombone system can be installed onto a Beaglebone Black, or any system capable of running Debian Jessie, and allows you to host your own email and web services. With Freedombone you can enjoy true freedom and independence in the cloud. It comes in a variety of flavours.
4 4
 
5 5
  - **Full install**: Installs eveything
6
- - **Mailbox**: An email server with GPG encryption and mailing list
6
+ - **Mailbox**: An email server with GPG encryption
7 7
  - **Cloud**: Share files, maintain a calendar and collaborate on document editing
8 8
  - **Social**: Social networking with Hubzilla and GNU Social
9 9
  - **Media**: Runs media services such as DLNA to play music or videos on your devices

+ 1
- 1
doc/EN/usage.org 查看文件

@@ -204,7 +204,7 @@ Select the *IRC Menu* and then change the password. An empty password will allow
204 204
 
205 205
 ** XMPP/Jabber
206 206
 *** Using with Profanity
207
-The [[http://profanity.im][Profanity]] shell based user interface and is perhaps the simplest way to use XMPP from a laptop. It's also a good way to ensure that your [[between different devices ][OTR keys]] are the same even when logging in from different laptops or devices, and it also means that if those devices later become compomised then there are no locally stored OTR keys to be found.
207
+The [[http://profanity.im][Profanity]] shell based user interface and is perhaps the simplest way to use XMPP from a laptop. It's also a good way to ensure that your OTR keys are the same even when logging in from different laptops or devices, and it also means that if those devices later become compomised then there are no locally stored OTR keys to be found.
208 208
 
209 209
 #+BEGIN_SRC bash
210 210
 ssh username@domain -p 2222

+ 1
- 1
doc/EN/variants.org 查看文件

@@ -22,7 +22,7 @@ Freedombone may be installed either in its entirety or as different variants wit
22 22
  <center>
23 23
  <table style="width:80%; border:0">
24 24
   <tr>
25
-    <td><center><b>Mailbox</b><br>An email server with GPG encryption and mailing list</center></td>
25
+    <td><center><b>Mailbox</b><br>An email server with GPG encryption</center></td>
26 26
     <td><center><b>Cloud</b><br>Share files, maintain a calendar and collaborate on document editing</center></td>
27 27
   </tr>
28 28
   <tr>

二进制
man/freedombone.1.gz 查看文件


+ 71
- 47
website/EN/usage.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
-<!-- 2016-04-02 Sat 16:53 -->
6
+<!-- 2016-04-05 Tue 21:49 -->
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>
@@ -566,20 +566,44 @@ Enter <b>#freedombone</b> as the channel name.
566 566
 </p>
567 567
 
568 568
 <p>
569
+Enter the password which can be found from the IRC menu of the <b>control panel</b>.
570
+</p>
571
+
572
+<p>
569 573
 Click <b>close</b> and then <b>connect</b>.
570 574
 </p>
571 575
 </div>
572 576
 </div>
573
-</div>
574 577
 
575
-<div id="outline-container-orgheadline26" class="outline-3">
576
-<h3 id="orgheadline26">XMPP/Jabber</h3>
577
-<div class="outline-text-3" id="text-orgheadline26">
578
-</div><div id="outline-container-orgheadline21" class="outline-4">
579
-<h4 id="orgheadline21">Using with Profanity</h4>
578
+<div id="outline-container-orgheadline21" class="outline-4">
579
+<h4 id="orgheadline21">Changing or removing the IRC password</h4>
580 580
 <div class="outline-text-4" id="text-orgheadline21">
581 581
 <p>
582
-The <a href="http://profanity.im/">Profanity</a> shell based user interface and is perhaps the simplest way to use XMPP from a laptop.
582
+By default the IRC server is set up to require a password for users to log in. The password is the same for all users. If you want to change or remove the password:
583
+</p>
584
+
585
+<div class="org-src-container">
586
+
587
+<pre class="src src-bash">ssh myusername@mydomain -p 2222
588
+sudo control
589
+</pre>
590
+</div>
591
+
592
+<p>
593
+Select the <b>IRC Menu</b> and then change the password. An empty password will allow anyone to log in, so you can have a globally accessible IRC system if you wish, although you might want to carefully consider whether that's wise.
594
+</p>
595
+</div>
596
+</div>
597
+</div>
598
+
599
+<div id="outline-container-orgheadline27" class="outline-3">
600
+<h3 id="orgheadline27">XMPP/Jabber</h3>
601
+<div class="outline-text-3" id="text-orgheadline27">
602
+</div><div id="outline-container-orgheadline22" class="outline-4">
603
+<h4 id="orgheadline22">Using with Profanity</h4>
604
+<div class="outline-text-4" id="text-orgheadline22">
605
+<p>
606
+The <a href="http://profanity.im/">Profanity</a> shell based user interface and is perhaps the simplest way to use XMPP from a laptop. It's also a good way to ensure that your OTR keys are the same even when logging in from different laptops or devices, and it also means that if those devices later become compomised then there are no locally stored OTR keys to be found.
583 607
 </p>
584 608
 
585 609
 <div class="org-src-container">
@@ -667,9 +691,9 @@ When accessed via the user control panel the client is automatically routed thro
667 691
 </p>
668 692
 </div>
669 693
 </div>
670
-<div id="outline-container-orgheadline22" class="outline-4">
671
-<h4 id="orgheadline22">Using with Jitsi</h4>
672
-<div class="outline-text-4" id="text-orgheadline22">
694
+<div id="outline-container-orgheadline23" class="outline-4">
695
+<h4 id="orgheadline23">Using with Jitsi</h4>
696
+<div class="outline-text-4" id="text-orgheadline23">
673 697
 <p>
674 698
 Jitsi is the recommended communications client for desktop or laptop systems, since it includes the <i>off the record</i> (OTR) feature which provides some additional security beyond the usual SSL certificates.
675 699
 </p>
@@ -699,9 +723,9 @@ You can also <a href="https://www.youtube.com/watch?v=vgx7VSrDGjk">see this vide
699 723
 </p>
700 724
 </div>
701 725
 </div>
702
-<div id="outline-container-orgheadline23" class="outline-4">
703
-<h4 id="orgheadline23">Using with Ubuntu</h4>
704
-<div class="outline-text-4" id="text-orgheadline23">
726
+<div id="outline-container-orgheadline24" class="outline-4">
727
+<h4 id="orgheadline24">Using with Ubuntu</h4>
728
+<div class="outline-text-4" id="text-orgheadline24">
705 729
 <p>
706 730
 The default XMPP client in Ubuntu is Empathy.  Using Empathy isn't as secure as using Jitsi, since it doesn't include the <i>off the record</i> feature, but since it's the default it's what many users will have easy access to.
707 731
 </p>
@@ -719,17 +743,17 @@ Click on <b>Advanced</b> and make sure that <b>Encryption required</b> and <b>Ig
719 743
 </p>
720 744
 </div>
721 745
 </div>
722
-<div id="outline-container-orgheadline24" class="outline-4">
723
-<h4 id="orgheadline24">Using Tor Messenger</h4>
724
-<div class="outline-text-4" id="text-orgheadline24">
746
+<div id="outline-container-orgheadline25" class="outline-4">
747
+<h4 id="orgheadline25">Using Tor Messenger</h4>
748
+<div class="outline-text-4" id="text-orgheadline25">
725 749
 <p>
726 750
 Tor Messenger is a messaging client which supports XMPP, and its onion routing enables you to protect the metadata of chat interactions to some extent by making it difficult for an adversary to know which server is talking to which. You can download Tor Messenger from <a href="https://torproject.org/">torproject.org</a> and the setup is pretty simple.
727 751
 </p>
728 752
 </div>
729 753
 </div>
730
-<div id="outline-container-orgheadline25" class="outline-4">
731
-<h4 id="orgheadline25">Using with Android</h4>
732
-<div class="outline-text-4" id="text-orgheadline25">
754
+<div id="outline-container-orgheadline26" class="outline-4">
755
+<h4 id="orgheadline26">Using with Android</h4>
756
+<div class="outline-text-4" id="text-orgheadline26">
733 757
 <p>
734 758
 Install <a href="https://f-droid.org/">F-Droid</a>
735 759
 </p>
@@ -765,16 +789,16 @@ Then select <b>Next</b>. When chatting you can use the lock icon to encrypt your
765 789
 </div>
766 790
 </div>
767 791
 </div>
768
-<div id="outline-container-orgheadline27" class="outline-3">
769
-<h3 id="orgheadline27">Tox</h3>
770
-<div class="outline-text-3" id="text-orgheadline27">
792
+<div id="outline-container-orgheadline28" class="outline-3">
793
+<h3 id="orgheadline28">Tox</h3>
794
+<div class="outline-text-3" id="text-orgheadline28">
771 795
 <p>
772 796
 Tox is an encrypted peer-to-peer messaging system and so should work without Freedombone. It uses a system of nodes which act as a sort of directory service allowing users to find and connect to each other. The Tox node ID on the Freedombone can be found within the README within your home directory. If you have other users connect to your node then you will be able to continue chatting even when no other nodes are available.
773 797
 </p>
774 798
 </div>
775
-<div id="outline-container-orgheadline28" class="outline-4">
776
-<h4 id="orgheadline28">Using the Toxic client</h4>
777
-<div class="outline-text-4" id="text-orgheadline28">
799
+<div id="outline-container-orgheadline29" class="outline-4">
800
+<h4 id="orgheadline29">Using the Toxic client</h4>
801
+<div class="outline-text-4" id="text-orgheadline29">
778 802
 <p>
779 803
 Log into your system with:
780 804
 </p>
@@ -798,12 +822,12 @@ Then from the menu select <b>Tox Chat</b>. Tox is encrypted by default and also
798 822
 </div>
799 823
 </div>
800 824
 
801
-<div id="outline-container-orgheadline31" class="outline-3">
802
-<h3 id="orgheadline31">VoIP (Voice chat)</h3>
803
-<div class="outline-text-3" id="text-orgheadline31">
804
-</div><div id="outline-container-orgheadline29" class="outline-4">
805
-<h4 id="orgheadline29">Using with Ubuntu</h4>
806
-<div class="outline-text-4" id="text-orgheadline29">
825
+<div id="outline-container-orgheadline32" class="outline-3">
826
+<h3 id="orgheadline32">VoIP (Voice chat)</h3>
827
+<div class="outline-text-3" id="text-orgheadline32">
828
+</div><div id="outline-container-orgheadline30" class="outline-4">
829
+<h4 id="orgheadline30">Using with Ubuntu</h4>
830
+<div class="outline-text-4" id="text-orgheadline30">
807 831
 <p>
808 832
 Within the software center search for "mumble" and install the client then run it. Skip through the audio setup wizard.
809 833
 </p>
@@ -817,9 +841,9 @@ Click on "add new" to add a new server and enter the default domain name for the
817 841
 </p>
818 842
 </div>
819 843
 </div>
820
-<div id="outline-container-orgheadline30" class="outline-4">
821
-<h4 id="orgheadline30">Using with Android</h4>
822
-<div class="outline-text-4" id="text-orgheadline30">
844
+<div id="outline-container-orgheadline31" class="outline-4">
845
+<h4 id="orgheadline31">Using with Android</h4>
846
+<div class="outline-text-4" id="text-orgheadline31">
823 847
 <p>
824 848
 Install <a href="https://f-droid.org/">F-Droid</a>
825 849
 </p>
@@ -846,24 +870,24 @@ Selecting the server by pressing on it then connects you to the server so that y
846 870
 </div>
847 871
 </div>
848 872
 </div>
849
-<div id="outline-container-orgheadline32" class="outline-3">
850
-<h3 id="orgheadline32">SIP phones</h3>
851
-<div class="outline-text-3" id="text-orgheadline32">
873
+<div id="outline-container-orgheadline33" class="outline-3">
874
+<h3 id="orgheadline33">SIP phones</h3>
875
+<div class="outline-text-3" id="text-orgheadline33">
852 876
 <p>
853 877
 Freedombone also supports SIP phones The username and domain is the same as for your email address, and the SIP password and extension number will appear within the README file in your home directory. Various SIP client options are available, such as CSipSimple on Android and Jitsi on desktop or laptop machines. Ideally use clients which support ZRTP, which will provide the best level of security.
854 878
 </p>
855 879
 </div>
856
-<div id="outline-container-orgheadline33" class="outline-4">
857
-<h4 id="orgheadline33">About ZRTP</h4>
858
-<div class="outline-text-4" id="text-orgheadline33">
880
+<div id="outline-container-orgheadline34" class="outline-4">
881
+<h4 id="orgheadline34">About ZRTP</h4>
882
+<div class="outline-text-4" id="text-orgheadline34">
859 883
 <p>
860 884
 <a href="https://jitsi.org/Documentation/ZrtpFAQ">ZRTP</a> appears to be the current best standard to end-to-end encrypted voice calls, combining good security with simplicity of use. When the initial cryptographic negotiation between phones is done at the start of a call a short authentication string (SAS) is calculated and displayed at both ends. To check that there isn't anyone intercepting the call and acting as a <i>man in the middle</i> - as <a href="https://en.wikipedia.org/wiki/Stingray_phone_tracker">stingray type devices</a> try to do - the short authentication string can be read out and verbally confirmed between the callers. If it's the same then you can be pretty confident that the call is secure.
861 885
 </p>
862 886
 </div>
863 887
 </div>
864
-<div id="outline-container-orgheadline34" class="outline-4">
865
-<h4 id="orgheadline34">Using with CSIPSimple</h4>
866
-<div class="outline-text-4" id="text-orgheadline34">
888
+<div id="outline-container-orgheadline35" class="outline-4">
889
+<h4 id="orgheadline35">Using with CSIPSimple</h4>
890
+<div class="outline-text-4" id="text-orgheadline35">
867 891
 <p>
868 892
 Add an account. Under <b>General Wizards</b> choose <b>Expert</b> and enter the following details:
869 893
 </p>
@@ -919,9 +943,9 @@ If everything is working the account should appear in green with a status of <b>
919 943
 </p>
920 944
 </div>
921 945
 </div>
922
-<div id="outline-container-orgheadline35" class="outline-4">
923
-<h4 id="orgheadline35">Using with Ring</h4>
924
-<div class="outline-text-4" id="text-orgheadline35">
946
+<div id="outline-container-orgheadline36" class="outline-4">
947
+<h4 id="orgheadline36">Using with Ring</h4>
948
+<div class="outline-text-4" id="text-orgheadline36">
925 949
 <p>
926 950
 From the menu select <b>Manage accounts</b>.
927 951
 </p>

+ 2
- 2
website/EN/variants.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
-<!-- 2016-02-27 Sat 22:12 -->
6
+<!-- 2016-04-05 Tue 21:44 -->
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>
@@ -169,7 +169,7 @@ Freedombone may be installed either in its entirety or as different variants wit
169 169
  <center>
170 170
  <table style="width:80%; border:0">
171 171
   <tr>
172
-    <td><center><b>Mailbox</b><br>An email server with GPG encryption and mailing list</center></td>
172
+    <td><center><b>Mailbox</b><br>An email server with GPG encryption</center></td>
173 173
     <td><center><b>Cloud</b><br>Share files, maintain a calendar and collaborate on document editing</center></td>
174 174
   </tr>
175 175
   <tr>