Merge branch 'master' into v7

NethServer · Aug 28, 2018 · 8cb76f1 · 8cb76f1
2 parents 94e9b9f + 846ddbb
commit 8cb76f1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/developer-manual/en/nethserver-base.rst b/developer-manual/en/nethserver-base.rst
@@ -129,9 +129,6 @@ the script: ``/usr/libexec/nethserver/update-networks-db`` .
 
 The *networks* database is updated Whenever an interface is plugged into the system.
 
-Best practices
---------------
-
 DHCP on red interfaces
 ----------------------
 
@@ -229,6 +226,14 @@ configuration by following these steps.
 
 6. Open the web interface and reconfigure accordingly to your needs
 
+Zeroconf network
+----------------
+
+Zeroconf network (http://www.zeroconf.org/) shouldn't be usefull on a server.
+It can be safely disabled using these commands: ::
+
+  config setprop sysconfig ZeroConf disabled
+  signal-event interface-update
 
 Log retention and rotation
 ==========================
@@ -290,6 +295,7 @@ Main repositories are:
 * ``updates``: updated packages from CentOS. Enabled by default.
 * ``centos-sclo-rh`` and ``centos-sclo-sclo``: SCL repositories. Both enabled by default.
 * ``extras``: extra RPMs. Enabled by default.
+* ``epel``: Extra Packages for Enterprise Linux. Enabled by default.
 
 A standard installation should have the following enabled repositories:
 
@@ -301,6 +307,7 @@ A standard installation should have the following enabled repositories:
 * centos-sclo-rh
 * centos-sclo-sclo
 * extras
+* epel
 
 Packages published in above repositories should always allow a non-disruptive automatic update.
 
@@ -310,7 +317,7 @@ NS Release Lock
 As default |product| is configured to access latest upstream repositories using the
 "Rolling release" approach.
 
-It is possibile to lock repositories to che current minor release using ``NS release lock`` feature: ::
+It is possible to lock repositories to the current minor release using ``NS release lock`` feature: ::
 
   config setprop sysconfig NsReleaseLock enabled
   signal-event software-repos-save

diff --git a/developer-manual/en/nethserver-ejabberd.rst b/developer-manual/en/nethserver-ejabberd.rst
@@ -22,11 +22,15 @@ Configuration
 Properties:
 
 * *WebAdmin*: enable ejabberd built-in web interfac. Can be ``enabled`` or ``disabled``, default is ``disabled``
-* *WelcomeSubject*: subject to be shown in the welcome message, default value is empty
-* *WelcomeText*: welcome message, default value is empty
-* *XMPPAccess*: enable TLS access if value is ``tls``, which is the default value. If empty, TLS is disabled.
+* *S2S*: Enable the server-to-server (XMMP federation). can be ``enabled``, default is ``disabled``
+* *ModMamStatus*: the new message archive management (mod_mam). can be ``enabled``, default is ``disabled``
+* *ModMamPurgeDBStatus*: Purge the Mnesia database of old messages of mod_mam
+* *ModMamPurgeDBInterval*: Remove messages older than X days, default is ``30``
+* *ShaperFast*: Download speed limit in bytes/second for admin users, default is ``1000000``
+* *ShaperNormal*: Download speed limit in bytes/second for users, default is ``500000``
 
-When enabled, web-based adminsitration interface listens on 5280 port.
+
+When enabled, web-based administration interface listens on 5280 port.
 You need a user inside jabberadmins group to login.
 
 Default access to server ports is set to public on following ports: 5280, 5222, 5223.