Skip to content

Commit

Permalink
Merge pull request #500 from NethServer/master
Browse files Browse the repository at this point in the history
Merge master into v7
  • Loading branch information
gsanchietti committed May 5, 2020
2 parents b599db6 + ad1ac21 commit e1714d3
Show file tree
Hide file tree
Showing 42 changed files with 2,760 additions and 815 deletions.
12 changes: 12 additions & 0 deletions administrator-manual/en/.tx/config
Original file line number Diff line number Diff line change
Expand Up @@ -434,3 +434,15 @@ file_filter = locale/<lang>/LC_MESSAGES/mssql.po
source_file = _build/locale/mssql.pot
source_lang = en
type = PO

[docs-v7.sandbox]
file_filter = locale/<lang>/LC_MESSAGES/sandbox.po
source_file = _build/locale/sandbox.pot
source_lang = en
type = PO

[docs-v7.antivirus]
file_filter = locale/<lang>/LC_MESSAGES/antivirus.po
source_file = _build/locale/antivirus.pot
source_lang = en
type = PO
6 changes: 3 additions & 3 deletions administrator-manual/en/access.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

.. _access-section:

============================
Accessing the Server Manager
============================
================================
Accessing the old Server Manager
================================

.. note:: A new Server Manager based on Cockpit is available. See :ref:`access2-section`.

Expand Down
10 changes: 6 additions & 4 deletions administrator-manual/en/access2.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
.. _access2-section:

================================
Accessing the new Server Manager
================================
============================
Accessing the Server Manager
============================

.. note:: Documentation about the old Server Manager is available :ref:`here <access2-section>`.

|product| can be configured using the :dfn:`Server Manager` web interface.
You need a web browser like Mozilla Firefox or Google Chrome to access the web interface using the address (URL)
Expand All @@ -25,7 +27,7 @@ as **root** and type the password chosen during |product| installation.
``Nethesis,1234``.


Besides root, all users with the :guilabel:`Shell` option enabled can access the Server Manager.
Besides root, all users with a :ref:`delegated<delegation-section>` panel can access the Server Manager.

The web interface language is automatically chosen depending on your browser configuration.
If you wish to change the language, go to your user name
Expand Down
1 change: 0 additions & 1 deletion administrator-manual/en/backup_customization.rst
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ automatically deleted to free space.

Supported storage backends:

- CIFS
- NFS
- USB
- WebDAV (only when used as *single backup*)
Expand Down
6 changes: 3 additions & 3 deletions administrator-manual/en/base_system.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.. _base_system-section:

===========
Base system
===========
=================
Base system (old)
=================

.. note:: A new Server Manager based on Cockpit is available. See :ref:`base_system2-section`.

Expand Down
14 changes: 10 additions & 4 deletions administrator-manual/en/base_system2.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
.. _base_system2-section:

=================
Base system (new)
=================
===========
Base system
===========

.. note:: The documentation of the Server Manager is available at :ref:`base_system-section`.
.. note:: Documentation about the old Server Manager is available :ref:`here <base_system-section>`.

This chapter describes all available modules at the end of installation. All
modules outside this section can be installed from the :ref:`software-center-section` page.
Expand Down Expand Up @@ -107,11 +107,15 @@ The :index:`SSH` page displays the number of current SSH connections. From this
section the administrator can change the OpenSSH listening port, disable root
login and password authentication.

By default, SSH access is limited to ``root`` user and all users inside the designated
administrative group (``Domain Admins``).
It is possible to selectively grant SSH and :index:`SFTP` access to some groups,
while administrators are always granted access to SSH and SFTP.

SSH and SFTP permissions are available once the :guilabel:`System > Settings >
Shell policy > Override the shell of users` has been enabled.
If :guilabel:`Override the shell of users` is disabled, only users with :guilabel:`Shell`
option can access the Server Manager, and delegation is not required any more.


.. _settings-section:
Expand Down Expand Up @@ -285,6 +289,8 @@ The following pages are always accessible to all users:
* applications
* terminal

.. _2fa-section:

Two-factor authentication (2FA)
===============================

Expand Down
3 changes: 2 additions & 1 deletion administrator-manual/en/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@
'nethcti_intro.rst',
'phonebook-mysql.rst',
'registration.rst',
'launcher.rst'
'launcher.rst',
'sandbox.rst'
])
rst_prolog="""
.. |product| replace:: NethServer
Expand Down
2 changes: 2 additions & 0 deletions administrator-manual/en/fail2ban.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.. _fail2ban-section:

========
Fail2ban
========
Expand Down
7 changes: 3 additions & 4 deletions administrator-manual/en/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Administrator Manual
:caption: Installation

installation
access
access2
registration

.. only:: nscom
Expand All @@ -52,7 +52,7 @@ Administrator Manual
:caption: Configuration

packages
base_system
base_system2
accounts
dns
dhcp
Expand All @@ -64,7 +64,6 @@ Administrator Manual
:maxdepth: 1

launcher
sandbox

.. toctree::
:maxdepth: 1
Expand All @@ -84,7 +83,6 @@ Administrator Manual
mail
webmail
webtop5
pop3_proxy
pop3_connector
chat
team_chat
Expand Down Expand Up @@ -117,6 +115,7 @@ Administrator Manual
rspamd
antivirus
blacklist
sandbox

.. toctree::
:hidden:
Expand Down
6 changes: 3 additions & 3 deletions administrator-manual/en/locale/es/LC_MESSAGES/access.po
Original file line number Diff line number Diff line change
Expand Up @@ -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-04-27 15:54+0200\n"
"PO-Revision-Date: 2017-02-06 14:48+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"
Expand All @@ -29,8 +29,8 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: ../../access.rst:9
msgid "Accessing the Server Manager"
msgstr "Accediendo al administrador del servidor"
msgid "Accessing the old Server Manager"
msgstr ""

#: ../../access.rst:11
msgid ""
Expand Down
48 changes: 27 additions & 21 deletions administrator-manual/en/locale/es/LC_MESSAGES/access2.po
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,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-04-27 15:54+0200\n"
"PO-Revision-Date: 2019-10-07 12:37+0000\n"
"Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"
"MIME-Version: 1.0\n"
Expand All @@ -25,119 +25,125 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: ../../access2.rst:5
msgid "Accessing the new Server Manager"
msgid "Accessing the Server Manager"
msgstr ""

#: ../../access2.rst:7
msgid ""
"Documentation about the old Server Manager is available :ref:`here "
"<access2-section>`."
msgstr ""

#: ../../access2.rst:9
msgid ""
"|product| can be configured using the :dfn:`Server Manager` web interface. "
"You need a web browser like Mozilla Firefox or Google Chrome to access the "
"web interface using the address (URL) ``https://a.b.c.d:9090`` or "
"``https://server_name:9090`` where *a.b.c.d* and *server_name* respectively "
"are the server IP address and name configured during installation."
msgstr ""

#: ../../access2.rst:12
#: ../../access2.rst:14
msgid ""
"Since the Server Manager uses a self-signed SSL certificate as default, the "
"first time you access the server you should explicitly accept the "
"certificate. Despite the warning, the connection is safe and encrypted, but "
"you are advised to configure a valid certificate, later."
msgstr ""

#: ../../access2.rst:17
#: ../../access2.rst:19
msgid "Login"
msgstr ""

#: ../../access2.rst:19
#: ../../access2.rst:21
msgid ""
"The login page will give you a trusted access to the web interface. Log in "
"as **root** and type the password chosen during |product| installation."
msgstr ""

#: ../../access2.rst:24
#: ../../access2.rst:26
msgid ""
"The *unattended* install procedure sets the root password to the default "
"``Nethesis,1234``."
msgstr ""

#: ../../access2.rst:28
#: ../../access2.rst:30
msgid ""
"Besides root, all users with the :guilabel:`Shell` option enabled can access"
" the Server Manager."
msgstr ""

#: ../../access2.rst:30
#: ../../access2.rst:32
msgid ""
"The web interface language is automatically chosen depending on your browser"
" configuration. If you wish to change the language, go to your user name on "
"the upper right corner of the screen and select :guilabel:`Display "
"Language`."
msgstr ""

#: ../../access2.rst:36
#: ../../access2.rst:38
msgid "Login to remote servers"
msgstr ""

#: ../../access2.rst:38
#: ../../access2.rst:40
msgid ""
"The login page allows access the local machine (default) or a remote one. To"
" access a remote server, first make sure the server is accessible using SSH."
" Then click on :guilabel:`Other options` and enter the host name (or IP "
"address) of the remote server inside the :guilabel:`Connect to` field."
msgstr ""

#: ../../access2.rst:43
#: ../../access2.rst:45
msgid ""
"The Server Manager will try to access the remote machine using SSH on port "
"22. If the remote server use a different port, you can specify it with the "
"``host:port`` syntax (eg. ``a.b.c.d:222``)."
msgstr ""

#: ../../access2.rst:49
#: ../../access2.rst:51
msgid "Hints"
msgstr ""

#: ../../access2.rst:51
#: ../../access2.rst:53
msgid ""
"After login, the system is ready to be used but you're advised to review the"
" list of hints which will guide you to correctly configure the machine. "
"Hints are shown as yellow markers with a number over the left menu items."
msgstr ""

#: ../../access2.rst:55
#: ../../access2.rst:57
msgid "As best practice you should at least:"
msgstr ""

#: ../../access2.rst:57
#: ../../access2.rst:59
msgid "change the default root password"
msgstr ""

#: ../../access2.rst:58
#: ../../access2.rst:60
msgid "set the correct date and time"
msgstr ""

#: ../../access2.rst:61
#: ../../access2.rst:63
msgid "Change the current password"
msgstr ""

#: ../../access2.rst:63
#: ../../access2.rst:65
msgid ""
"All users with access to the Server Manager can change their own password "
"from the :guilabel:`Settings` menu."
msgstr ""

#: ../../access2.rst:66
#: ../../access2.rst:68
msgid ""
"Users without shell access should use the old Server Manager. See :ref"
":`access-section`."
msgstr ""

#: ../../access2.rst:69
#: ../../access2.rst:71
msgid "Logout"
msgstr ""

#: ../../access2.rst:71
#: ../../access2.rst:73
msgid ""
"Terminate the current Server Manager session by going to your user name on "
"the upper right corner of the screen and by clicking on :guilabel:`Log Out`."
Expand Down

0 comments on commit e1714d3

Please sign in to comment.