Merge branch 'master' into v7

NethServer · Jan 12, 2018 · 397f144 · 397f144
2 parents ce4951f + 8136674
commit 397f144
Show file tree

Hide file tree

Showing 116 changed files with 2,928 additions and 867 deletions.
diff --git a/administrator-manual/en/.gitignore b/administrator-manual/en/.gitignore
@@ -0,0 +1,2 @@
+locale/sr
+locale/tr
diff --git a/administrator-manual/en/.tx/config b/administrator-manual/en/.tx/config
@@ -311,3 +311,14 @@ source_file = _build/locale/freepbx.pot
 source_lang = en
 type = PO
 
+[docs-v7.ui]
+file_filter = locale/<lang>/LC_MESSAGES/ui.po
+source_file = _build/locale/ui.pot
+source_lang = en
+type = PO
+
+[docs-v7.hotsync]
+file_filter = locale/<lang>/LC_MESSAGES/hotsync.po
+source_file = _build/locale/hotsync.pot
+source_lang = en
+type = PO
diff --git a/administrator-manual/en/accounts.rst b/administrator-manual/en/accounts.rst
@@ -285,7 +285,7 @@ After the prerequisite is fulfilled, proceed to the page
                 password for it.
 
 Once |product| has successfuly joined AD, specify the **dedicated user account**
-credentials in :guilabel:`Accounts provider > Read-only bind credentials`.
+credentials in :guilabel:`Accounts provider > Authentication credentials for LDAP applications`.
 
 .. _bind-remote-ldap-section:
 

diff --git a/administrator-manual/en/backup.rst b/administrator-manual/en/backup.rst
@@ -16,14 +16,14 @@ The purpose of this kind of backup is to quickly restore a machine in case of
 done even if the machine is already in production.
 
 **Data backup** is enabled by installing the "Backup" module and contains all
-data like user's home directories and mails. It runs every night and can be
+data such as user's home directories and mails. It runs every night and can be
 full or incremental on a weekly basis.  This backup also contains the archive of
 the configuration backup.
 
-Data backup can be saved on different destinations:
+Data backup can be saved on one destination chosen between:
 
 * USB: disk connected to a local USB port (See: :ref:`backup_usb_disk-section`)
-* CIFS: Windows shared folder, it's available on all NAS (Network Attached Storage)
+* CIFS: Windows shared folder, it's available on all NAS (Network Attached Storage). Use access credentials like: MyBindUser,domain=mydomain.com
 * NFS: Linux shared folder, it's available on all NAS, usually faster than CIFS
 * WebDAV: available on many NAS and remote servers (Use a server with a valid SSL certificate as webDAV target, otherwise the system will fail mounting the filesystem)
 

diff --git a/administrator-manual/en/hotsync.rst b/administrator-manual/en/hotsync.rst
@@ -0,0 +1,123 @@
+.. _hotsync-section:
+
+=======
+HotSync
+=======
+
+.. warning::
+
+   HotSync should be considered a `beta release <https://en.wikipedia.org/wiki/Software_release_life_cycle#Beta>`_.
+   Please test it on your environment before using in production.
+
+HotSync aims to reduce downtime in case of failure, syncing your |product| with another one, that will be manually activated in case of master server failure.
+
+Normally, when a hardware damage occurs, the time needed to restore service is:
+
+1. fix/buy another server: from 4h to 2 days
+2. install OS: 30 minutes
+3. restore backup: from 10 minutes to 8 hours
+
+In summary, users are able to start working again with data from the night before failure after a few hours/days. Using hotsync, time 1 and 3 are 0, 2 is 5 minutes (time to activate spare server). Users are able to start working again in few minutes, using data from a few minutes before the crash.
+
+
+By default all data included in backup are synchronized every 15 minutes. MariaDB databases are synchronized too, unless databases synchronization isn't disabled.
+Applications that use PostgreSQL are synchronized (Mattermost, Webtop5) unless databases synchronization isn't disabled.
+
+
+Terminology
+===========
+
+- MASTER is the production system SLAVE is the spare server
+- SLAVE is switched on, with an IP address different than MASTER
+- Every 15 minutes, MASTER makes a backup on SLAVE
+- An email is sent to root (admin if mail server is installed)
+
+
+Installation
+============
+
+Install nethserver-hotsync on both MASTER and SLAVE, execute from command line: ::
+
+  yum install nethserver-hotsync
+
+If you want to install Cockpit-based web interface, execute also: ::
+
+  yum install nethserver-cockpit-hotsync
+
+Configuration
+=============
+
+Master
+------
+
+::
+
+    [root@master]# config setprop rsyncd password <PASSWORD>
+    [root@master]# config setprop hotsync role master
+    [root@master]# config setprop hotsync SlaveHost <SLAVE_IP>
+    [root@master]# signal-event nethserver-hotsync-update
+
+
+Slave
+-----
+
+::
+
+    [root@slave]# config setprop rsyncd password <PASSWORD>
+    [root@slave]# config setprop hotsync role slave
+    [root@slave]# config setprop hotsync MasterHost <MASTER_IP>
+    [root@slave]# signal-event nethserver-hotsync-update
+
+
+<PASSWORD> must be the same on master and slave.
+
+If mysql or postgresql are installed, they will be synchronized by default. To disable databases sync
+
+::
+
+    [root@master]# config setprop hotsync databases disabled
+    [root@master]# signal-event nethserver-hotsync-update
+
+
+Restore: put SLAVE in production
+================================
+
+1. Switch off MASTER if it's on
+2. On SLAVE launch restore command:
+
+::
+       
+    [root@slave]# signal-event nethserver-hotsync-restore
+
+
+Don't forget to:
+
+- connect modem to spare if you have one
+- connect backup HD to spare
+- connect router
+
+To put again in production original server, configure it as SLAVE, sync it, switch off current MASTER and restore configuration backup.
+
+
+==================
+Supported packages
+==================
+
+* nethserver-nextcloud
+* nethserver-mysql
+* nethserver-dnsmasq
+* nethserver-squidguard
+* nethserver-pulledpork
+* nethserver-antivirus
+* nethserver-samba-audit
+* nethserver-freepbx > 14.0.3
+* nethserver-webtop5 (z-push state is not synchronized)
+* nethserver-collectd
+* nethserver-cups
+* nethserver-dc
+* nethserver-letsencrypt
+* nethserver-nextcloud
+* nethserver-sssd
+* nethserver-directory
+* nethserver-ibays
+* nethserver-mail-server
diff --git a/administrator-manual/en/index.rst b/administrator-manual/en/index.rst
@@ -92,6 +92,7 @@ Modules
    weekly_report
    hotspot
    freepbx
+   hotsync
 
 .. only:: nscom
 
@@ -102,6 +103,7 @@ Modules
        :maxdepth: 1
 
        webvirtmgr
+       sogo
 
 Best practices
 --------------
@@ -110,7 +112,7 @@ Best practices
    :maxdepth: 2
 
    third_party
-
+   
 Appendix
 --------
 
@@ -128,7 +130,12 @@ Appendix
     -------
 
     * :ref:`General index <genindex>`
-    * :ref:`Search <search>`
+
+.. toctree::
+   :hidden:
+   :glob:
+
+   ui/*
 
 
 

diff --git a/administrator-manual/en/locale/es/LC_MESSAGES/access.po b/administrator-manual/en/locale/es/LC_MESSAGES/access.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NethServer Enterprise 7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-23 16:42+0200\n"
+"POT-Creation-Date: 2018-01-10 15:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Martin Abeleira <mabeleira@gmail.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"

diff --git a/administrator-manual/en/locale/es/LC_MESSAGES/accounts.po b/administrator-manual/en/locale/es/LC_MESSAGES/accounts.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NethServer Enterprise 7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-23 16:42+0200\n"
+"POT-Creation-Date: 2018-01-10 15:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: JѳƝ Ҝᶖμ <elnene.jonkiu@gmail.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"
@@ -577,8 +577,8 @@ msgstr ""
 #: ../../accounts.rst:294 ../../accounts.rst:297
 msgid ""
 "Once |product| has successfuly joined AD, specify the **dedicated user "
-"account** credentials in :guilabel:`Accounts provider > Read-only bind "
-"credentials`."
+"account** credentials in :guilabel:`Accounts provider > Authentication "
+"credentials for LDAP applications`."
 msgstr ""
 
 #: ../../accounts.rst:300 ../../accounts.rst:303

diff --git a/administrator-manual/en/locale/es/LC_MESSAGES/backup.po b/administrator-manual/en/locale/es/LC_MESSAGES/backup.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NethServer Enterprise 7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-23 16:42+0200\n"
+"POT-Creation-Date: 2018-01-10 15:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Rubén Rothermel <ruben_rothermel@yahoo.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"
@@ -57,14 +57,14 @@ msgstr ""
 #: ../../backup.rst:25 ../../backup.rst:28
 msgid ""
 "**Data backup** is enabled by installing the \"Backup\" module and contains "
-"all data like user's home directories and mails. It runs every night and can"
-" be full or incremental on a weekly basis.  This backup also contains the "
-"archive of the configuration backup."
+"all data such as user's home directories and mails. It runs every night and "
+"can be full or incremental on a weekly basis.  This backup also contains the"
+" archive of the configuration backup."
 msgstr ""
 
 #: ../../backup.rst:30 ../../backup.rst:33
-msgid "Data backup can be saved on different destinations:"
-msgstr "Los datos de respaldo pueden ser guardados en destinos diferentes"
+msgid "Data backup can be saved on one destination chosen between:"
+msgstr ""
 
 #: ../../backup.rst:32 ../../backup.rst:35
 msgid ""
@@ -77,10 +77,8 @@ msgstr ""
 #: ../../backup.rst:33 ../../backup.rst:36
 msgid ""
 "CIFS: Windows shared folder, it's available on all NAS (Network Attached "
-"Storage)"
+"Storage). Use access credentials like: MyBindUser,domain=mydomain.com"
 msgstr ""
-"CIFS: Carpeta compartida de Windows, está disponible en todas las NAS "
-"(Network Attached Storage)"
 
 #: ../../backup.rst:34 ../../backup.rst:37
 msgid ""

diff --git a/administrator-manual/en/locale/es/LC_MESSAGES/bandwidth_monitor.po b/administrator-manual/en/locale/es/LC_MESSAGES/bandwidth_monitor.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NethServer Enterprise 7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-23 16:42+0200\n"
+"POT-Creation-Date: 2018-01-10 15:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Adrián Prado <adrian.prado@gmail.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"

diff --git a/administrator-manual/en/locale/es/LC_MESSAGES/base_system.po b/administrator-manual/en/locale/es/LC_MESSAGES/base_system.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NethServer Enterprise 7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-23 16:42+0200\n"
+"POT-Creation-Date: 2018-01-10 15:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Adrián Prado <adrian.prado@gmail.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"

diff --git a/administrator-manual/en/locale/es/LC_MESSAGES/chat.po b/administrator-manual/en/locale/es/LC_MESSAGES/chat.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NethServer Enterprise 7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-23 16:42+0200\n"
+"POT-Creation-Date: 2018-01-10 15:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Adrián Prado <adrian.prado@gmail.com>, 2017\n"
+"Last-Translator: Jose G. Jimenez S. <josegjimenez@gmail.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -79,6 +79,9 @@ msgid ""
 "dedicated user account in AD is required by the module to be fully "
 "operational! See :ref:`join-existing-ad-section`."
 msgstr ""
+"Si |product| es unido a un proveedor de cuentas Active Directory remoto, se "
+"necesita una cuenta AD dedicada para que el módulo esté completamente "
+"operativo. Ver :ref:`join-existing-ad-section`."
 
 #: ../../chat.rst:32 ../../chat.rst:35
 msgid "Client"

diff --git a/administrator-manual/en/locale/es/LC_MESSAGES/content_filter.po b/administrator-manual/en/locale/es/LC_MESSAGES/content_filter.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NethServer Enterprise 7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-23 16:42+0200\n"
+"POT-Creation-Date: 2018-01-10 15:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Adrián Prado <adrian.prado@gmail.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"

diff --git a/administrator-manual/en/locale/es/LC_MESSAGES/dhcp.po b/administrator-manual/en/locale/es/LC_MESSAGES/dhcp.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NethServer Enterprise 7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-23 16:42+0200\n"
+"POT-Creation-Date: 2018-01-10 15:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Adrián Prado <adrian.prado@gmail.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"

diff --git a/administrator-manual/en/locale/es/LC_MESSAGES/dns.po b/administrator-manual/en/locale/es/LC_MESSAGES/dns.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NethServer Enterprise 7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-23 16:42+0200\n"
+"POT-Creation-Date: 2018-01-10 15:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Adrián Prado <adrian.prado@gmail.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"

diff --git a/administrator-manual/en/locale/es/LC_MESSAGES/fax_server.po b/administrator-manual/en/locale/es/LC_MESSAGES/fax_server.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NethServer Enterprise 7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-23 16:42+0200\n"
+"POT-Creation-Date: 2018-01-10 15:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Adrián Prado <adrian.prado@gmail.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"

diff --git a/administrator-manual/en/locale/es/LC_MESSAGES/firewall.po b/administrator-manual/en/locale/es/LC_MESSAGES/firewall.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NethServer Enterprise 7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-23 16:42+0200\n"
+"POT-Creation-Date: 2018-01-10 15:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: JѳƝ Ҝᶖμ <elnene.jonkiu@gmail.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"