From 4bb01d598b8f76ba5a049c9c72b4e6a80a2414b1 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 5 Apr 2016 21:50:30 +0100 Subject: [PATCH] Tidying --- README.md | 2 +- doc/EN/usage.org | 2 +- doc/EN/variants.org | 2 +- man/freedombone.1.gz | Bin 5337 -> 5335 bytes website/EN/usage.html | 118 +++++++++++++++++++++++---------------- website/EN/variants.html | 4 +- 6 files changed, 76 insertions(+), 52 deletions(-) diff --git a/README.md b/README.md index 50dd9011..5c83c6ff 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ 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. - **Full install**: Installs eveything - - **Mailbox**: An email server with GPG encryption and mailing list + - **Mailbox**: An email server with GPG encryption - **Cloud**: Share files, maintain a calendar and collaborate on document editing - **Social**: Social networking with Hubzilla and GNU Social - **Media**: Runs media services such as DLNA to play music or videos on your devices diff --git a/doc/EN/usage.org b/doc/EN/usage.org index 46839f8e..052f8c6d 100644 --- a/doc/EN/usage.org +++ b/doc/EN/usage.org @@ -204,7 +204,7 @@ Select the *IRC Menu* and then change the password. An empty password will allow ** XMPP/Jabber *** Using with Profanity -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. +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. #+BEGIN_SRC bash ssh username@domain -p 2222 diff --git a/doc/EN/variants.org b/doc/EN/variants.org index 7dfcc9ec..454fb060 100644 --- a/doc/EN/variants.org +++ b/doc/EN/variants.org @@ -22,7 +22,7 @@ Freedombone may be installed either in its entirety or as different variants wit
- + diff --git a/man/freedombone.1.gz b/man/freedombone.1.gz index 5bda9d1db95f83cafe69e91822488d8be6858ca4..58fe946b45b2e161d1e2914b599886880acc8479 100644 GIT binary patch delta 2287 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 diff --git a/website/EN/usage.html b/website/EN/usage.html index c8a8f28b..5c0dd226 100644 --- a/website/EN/usage.html +++ b/website/EN/usage.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + @@ -565,21 +565,45 @@ Check use SSL and accept invalid SSL certificate. Enter #freedombone as the channel name.

+

+Enter the password which can be found from the IRC menu of the control panel. +

+

Click close and then connect.

+ +
+

Changing or removing the IRC password

+
+

+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: +

+ +
+ +
ssh myusername@mydomain -p 2222
+sudo control
+
+
+ +

+Select the IRC Menu 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. +

+
+
-
-

XMPP/Jabber

-
-
-

Using with Profanity

-
+
+

XMPP/Jabber

+
+
+

Using with Profanity

+

-The Profanity shell based user interface and is perhaps the simplest way to use XMPP from a laptop. +The 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.

@@ -667,9 +691,9 @@ When accessed via the user control panel the client is automatically routed thro

-
-

Using with Jitsi

-
+
+

Using with Jitsi

+

Jitsi is the recommended communications client for desktop or laptop systems, since it includes the off the record (OTR) feature which provides some additional security beyond the usual SSL certificates.

@@ -699,9 +723,9 @@ You can also see this vide

-
-

Using with Ubuntu

-
+
+

Using with Ubuntu

+

The default XMPP client in Ubuntu is Empathy. Using Empathy isn't as secure as using Jitsi, since it doesn't include the off the record feature, but since it's the default it's what many users will have easy access to.

@@ -719,17 +743,17 @@ Click on Advanced and make sure that Encryption required and Ig

-
-

Using Tor Messenger

-
+ -
-

Using with Android

-
+
+

Using with Android

+

Install F-Droid

@@ -765,16 +789,16 @@ Then select Next. When chatting you can use the lock icon to encrypt your
-
-

Tox

-
+
+

Tox

+

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.

-
-

Using the Toxic client

-
+
+

Using the Toxic client

+

Log into your system with:

@@ -798,12 +822,12 @@ Then from the menu select Tox Chat. Tox is encrypted by default and also
-
-

VoIP (Voice chat)

-
-
-

Using with Ubuntu

-
+
+

VoIP (Voice chat)

+
+
+

Using with Ubuntu

+

Within the software center search for "mumble" and install the client then run it. Skip through the audio setup wizard.

@@ -817,9 +841,9 @@ Click on "add new" to add a new server and enter the default domain name for the

-
-

Using with Android

-
+
+

Using with Android

+

Install F-Droid

@@ -846,24 +870,24 @@ Selecting the server by pressing on it then connects you to the server so that y
-
-

SIP phones

-
+
+

SIP phones

+

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.

-
-

About ZRTP

-
+
+

About ZRTP

+

ZRTP 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 man in the middle - as stingray type devices 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.

-
-

Using with CSIPSimple

-
+
+

Using with CSIPSimple

+

Add an account. Under General Wizards choose Expert and enter the following details:

@@ -919,9 +943,9 @@ If everything is working the account should appear in green with a status of

-
-

Using with Ring

-
+
+

Using with Ring

+

From the menu select Manage accounts.

diff --git a/website/EN/variants.html b/website/EN/variants.html index 2b7a904c..75429946 100644 --- a/website/EN/variants.html +++ b/website/EN/variants.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + @@ -169,7 +169,7 @@ Freedombone may be installed either in its entirety or as different variants wit
Mailbox
An email server with GPG encryption and mailing list
Mailbox
An email server with GPG encryption
Cloud
Share files, maintain a calendar and collaborate on document editing
- +
Mailbox
An email server with GPG encryption and mailing list
Mailbox
An email server with GPG encryption
Cloud
Share files, maintain a calendar and collaborate on document editing