Merge pull request #535 from NethServer/master

Align stable branch

administrator-manual/en/disaster_recovery.rst

@@ -19,6 +19,14 @@ Other restored configurations:
    installation, i.e., avoid restoring a configuration backup from a 7.4.1708 installation on a new 7.6.1810 system,
    as it may lead to unexpected results.
 
+.. only:: nscom
+
+   .. note::
+
+       Third-party repositories are not restored by the disaster recovery procedure.
+       If the original machine has some third-party repositories enabled, remember to install them before
+       proceeding with the restore.
+
 New Server Manager
 ------------------
 

administrator-manual/en/index.rst

@@ -70,8 +70,9 @@ Administrator Manual
    :caption: Applications - New Server Manager
 
    web_server
-   firewall2
+   firewall
    mail
+   shared_folder
 
 .. toctree::
    :maxdepth: 1
@@ -89,13 +90,11 @@ Administrator Manual
    ups
    report
    fax_server
-   firewall
    web_proxy
    content_filter
    suricata
    proxy_pass
    virtual_hosts
-   shared_folder
    bandwidth_monitor
    statistics
    vpn

administrator-manual/en/locale/es/LC_MESSAGES/upgrade.po

@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NethServer Enterprise 7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-20 10:53+0100\n"
+"POT-Creation-Date: 2020-09-28 15:50+0200\n"
 "PO-Revision-Date: 2017-03-21 10:46+0000\n"
 "Last-Translator: Adrián Prado Castro <adrian.prado@gmail.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"
@@ -49,7 +49,7 @@ msgid ":ref:`rsync <upgrade_with_rsync-section>`"
 msgstr ""
 
 #: ../../upgrade.rst:14
-msgid ":ref:`upgrade-tool <upgrade_with_tool-section>` (beta)"
+msgid ":ref:`upgrade-tool <upgrade_with_tool-section>`"
 msgstr ""
 
 #: ../../upgrade.rst:18
@@ -658,7 +658,7 @@ msgid ""
 msgstr ""
 
 #: ../../upgrade.rst:384
-msgid "Upgrade with Upgrade tool (beta)"
+msgid "Upgrade with Upgrade tool"
 msgstr ""
 
 #: ../../upgrade.rst:386

administrator-manual/en/locale/it/LC_MESSAGES/upgrade.po

@@ -11,17 +11,17 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Davide Principi <davide.principi@nethesis.it>, 2018
 # Nicola <nicola.rauso@nethesis.it>, 2019
+# Davide Principi <davide.principi@nethesis.it>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: NethServer Enterprise 7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-20 10:53+0100\n"
+"POT-Creation-Date: 2020-09-28 15:50+0200\n"
 "PO-Revision-Date: 2017-03-21 10:46+0000\n"
-"Last-Translator: Nicola <nicola.rauso@nethesis.it>, 2019\n"
+"Last-Translator: Davide Principi <davide.principi@nethesis.it>, 2020\n"
 "Language-Team: Italian (https://www.transifex.com/nethserver/teams/35834/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,8 +54,8 @@ msgid ":ref:`rsync <upgrade_with_rsync-section>`"
 msgstr ":ref:`rsync <upgrade_with_rsync-section>`"
 
 #: ../../upgrade.rst:14
-msgid ":ref:`upgrade-tool <upgrade_with_tool-section>` (beta)"
-msgstr ":ref:`upgrade-tool <upgrade_with_tool-section>` (beta)"
+msgid ":ref:`upgrade-tool <upgrade_with_tool-section>`"
+msgstr ":ref:`upgrade-tool <upgrade_with_tool-section>`"
 
 #: ../../upgrade.rst:18
 msgid ""
@@ -799,8 +799,8 @@ msgstr ""
 "data."
 
 #: ../../upgrade.rst:384
-msgid "Upgrade with Upgrade tool (beta)"
-msgstr "Upgrade tramite Upgrade tool (**beta**)"
+msgid "Upgrade with Upgrade tool"
+msgstr "Upgrade tramite Upgrade tool"
 
 #: ../../upgrade.rst:386
 msgid ""

administrator-manual/en/shared_folder.rst

@@ -212,6 +212,9 @@ Samba audit is a module that keeps track of all users activities on shared folde
 Auditing is disabled by default and must be explicitly enabled for each folder.
 
 Actions are logged to a file during the the day and are moved to a browseable database overnight.
+By default, to avoid the database overloading, read actions like access to files and directories are saved only inside :file:`/var/log/smbaudit.log`.
+To change this behavior and store read actions inside the database, access the :guilabel:`Settings` page and enable the :guilabel:`Enable auditing of read actions`.
 
-The report web interface is available from the old Server Manager from the :guilabel:`Applications` page,
-while the new Server Manager (Cockpit) integrates a new interface inside the :guilabel:`File server` application.
+The auditing report is available under the :guilabel:`Audit` page.
+
+The same report is also available from the old Server Manager inside the :guilabel:`Applications` page.

administrator-manual/en/upgrade.rst

@@ -11,7 +11,7 @@ methods:
 
 * :ref:`backup <upgrade_from_backup-section>` (see also :ref:`disaster-recovery-section`)
 * :ref:`rsync <upgrade_with_rsync-section>`
-* :ref:`upgrade-tool <upgrade_with_tool-section>` (beta)
+* :ref:`upgrade-tool <upgrade_with_tool-section>`
 
 .. warning::
 
@@ -380,8 +380,8 @@ At the end of ``rsync-upgrade`` run the following steps:
 
 .. _upgrade_with_tool-section:
 
-Upgrade with Upgrade tool (beta)
-================================
+Upgrade with Upgrade tool
+=========================
 
 The Upgrade tool module make it possible an **in-place upgrade** of |product| from 
 version 6 to version 7 with an automated procedure.

administrator-manual/en/vpn.rst

@@ -13,7 +13,11 @@ The system supports two types of VPNs:
 
 2. :index:`net2net` or :index:`tunnel`: connect two remote networks
 
-Roadwarrior OpenVPN, IPSec tunnel and OpenVPN tunnels are now part of the VPN application in the new Server Manager.
+Roadwarrior OpenVPN, IPSec tunnel and OpenVPN tunnels are part of the VPN application in the new Server Manager.
+
+By default, the network traffic between VPNs is blocked by the firewall. 
+To allow such traffic go to the :ref:`firewall-section` application and enable the :guilabel:`Allowed` field under
+:guilabel:`Settings > Traffic between OpenVPN roadwarrior, OpenVPN tunnels and IPSec tunnels`.
 
 .. _ovpn-section:
 
@@ -202,4 +206,3 @@ identifier` and :guilabel:`Remote identifier` fields must be set to
 custom unique names prepended with ``@``.  Common names are the
 geographic locations of the servers, such as the state or city name.
 
-