Merge branch 'master' into v7

NethServer · Aug 28, 2018 · 94e9b9f · 94e9b9f
2 parents bf2e74f + 510df59
commit 94e9b9f
Show file tree

Hide file tree

Showing 38 changed files with 5,779 additions and 2,148 deletions.
diff --git a/administrator-manual/en/backup.rst b/administrator-manual/en/backup.rst
diff --git a/administrator-manual/en/chat.rst b/administrator-manual/en/chat.rst
@@ -13,14 +13,26 @@ The main features are:
 * Broadcast messages 
 * Group chat 
 * Offline messages 
-* Transfer files over LAN 
+* Transfer files over LAN
+* S2S
+* Message archiving 
 
 All system users can access the chat using their own credentials.
 
 .. note::       If |product| is bound to a remote Active Directory account provider
                 a dedicated user account in AD is required by the module to be fully
                 operational! See :ref:`join-existing-ad-section`.
 
+Server to server (S2S)
+======================
+
+The XMPP system is federated by nature. If :index:`S2S` is enabled, users with accounts on one server
+can communicate with users on remote servers.
+S2S allows for servers communicating seamlessly with each other, forming a global 'federated' IM network.
+
+For this purpose, the SRV DNS record must be configured for your domain (https://wiki.xmpp.org/web/SRV_Records#XMPP_SRV_records)
+and the server must have a valid SSL/TLS certificate.
+
 Client
 ======
 
@@ -38,6 +50,12 @@ Enter the user name and the domain of the machine.
 If |product| is also the DNS server of the network, the client should automatically find the server's address through special 
 pre-configured DNS records. Otherwise, specify the server address in the advanced options.
 
+With TLS capabilities, strictly configured servers or clients could reject connections with your Ejabberd server 
+if the SSL/TLS certificate doesn't match the domain name.
+Also, the certificate should contain two sub-domains ``pubsub.*`` and ``conference.*``.
+This certificate can be obtained for free with Let's Encrypt (see :ref:`server_certificate-section`).
+
+
 Administrators
 ==============
 
@@ -50,3 +68,18 @@ Administrators can:
 
 
 The group ``jabberadmins`` is configurable from :ref:`groups-section` page.
+
+Message Archive Management
+==========================
+
+Message Archive Management (mod_mam) implements Message Archive Management as described in `XEP-0313 <http://xmpp.org/extensions/xep-0313.html>`_.
+When enabled, all messages will be stored inside the server and compatible XMPP clients can use it to store their chat history on the server.
+
+The database can store a maximum of 2GB of messages, archived messages can be purged automatically.
+To configure message retention policy, set :guilabel:`Clean messages older than X days` option.
+
+.. note::
+
+   If enabled, this module will store every message sent between users.
+   This behavior will affect the privacy of your users.
+
diff --git a/administrator-manual/en/fail2ban.rst b/administrator-manual/en/fail2ban.rst
@@ -17,7 +17,7 @@ Install from the Software Center or use the command line: ::
 Settings
 ========
 
-Fail2ban is configurable in the security category of the server-manager. Most of settings can be changed in the :guilabel:`Configuration` tab, only really advanced settings must be configured by the terminal. The :guilabel:`Ban status` tab displays the statistic and the banned IPs.
+Fail2ban is configurable in the security category of the server-manager. Most of settings can be changed in the :guilabel:`Configuration` tab, only really advanced settings must be configured by the terminal.
 
 Jails
 -----
@@ -62,9 +62,14 @@ Notify jail start/stop events
     Send email notifications when a jail is started or stopped.
 
 Unban IP
---------
+========
+
+IPs are banned when they are found several times in log, during a specific find time. They are stored in a database to be banned again each time your restart the server or the service. To unban an IP you can use the :guilabel:`Unban IP` tab in the status category of the server-manager.
+
+Statistics
+==========
 
-IPs are banned when they are found several times in log, during a specific find time. They are stored in a database to be banned again each time your restart the server or the service. To unban an IP you can use the :guilabel:`Ban status` tab.
+The :guilabel:`Ban statistics` tab is available in the status category of the server-manager, it gives you the total number of bans per jail as well as the total of all bans.
 
 Tools
 =====