Skip to content

Commit

Permalink
Merge pull request #437 from NethServer/master
Browse files Browse the repository at this point in the history
Publish changes on master branch
  • Loading branch information
DavidePrincipi committed Jul 18, 2019
2 parents 284b21b + fa0cb89 commit 34f412a
Show file tree
Hide file tree
Showing 14 changed files with 310 additions and 132 deletions.
22 changes: 20 additions & 2 deletions administrator-manual/en/accounts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ Example: ::

then execute: ::

/usr/share/doc/nethserver-sssd-<ver>/import_users <youfilename>
/usr/share/doc/nethserver-sssd-<ver>/scripts/import_users <youfilename>

For example, if the user’s file is /root/users.tsv, execute following command: ::

Expand All @@ -569,7 +569,25 @@ Then you can use the ``import_emails`` script. See :ref:`import-users_section` f
Import groups
-------------

Group management is available from the command line through ``group-create`` and ``group-modify`` events ::
It is possible to create groups from a TSV (Tab Separated Values) file with the following format: ::

group1 <TAB> user1 <TAB> user2 <NEWLINE>
group2 <TAB> user1 <TAB> user2 <TAB> user3 <NEWLINE>

Example: ::

faxmaster <TAB> matteo <TAB> luca <NEWLINE>
managers <TAB> marco <TAB> francesco <TAB> luca <NEWLINE>

then execute: ::

/usr/share/doc/nethserver-sssd-<ver>/scripts/import_groups <youfilename>

For example, if the group file is ``/root/groups.tsv``, execute following command: ::

/usr/share/doc/nethserver-sssd-`rpm --query --qf "%{VERSION}" nethserver-sssd`/scripts/import_groups /root/groups.tsv

Group management is also available from the command line through ``group-create`` and ``group-modify`` events ::

signal-event group-create group1 user1 user2 user3
signal-event group-modify group1 user1 user3 user4
Expand Down
16 changes: 13 additions & 3 deletions administrator-manual/en/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -300,11 +300,21 @@ comes already installed by the VPS provider.

.. _installation-enterprise:

Simply type the following command: ::
1. Access Nethesis Operation Center and `create a new server <https://my.nethesis.it/#/servers?action=newServer>`_.

curl -sS https://go.nethesis.it/install/ns7.sh | bash
2. Copy the secret token and run the following command in a CentOS command shell, replacing ``<SECRET>`` with the copied token: ::

Installation log is saved inside ``/tmp/nethserver-enterprise-install/install.log`` file.
curl -sS https://go.nethesis.it/install/ns7.sh | bash -s - <SECRET>

For instance, after replacing ``<SECRET>`` the command might look like ::

curl -sS https://go.nethesis.it/install/ns7.sh | bash -s - a0aa000aa000a00aa000a00aa00a00a0aa000aa000000a0aaa000a00a00aa00a

The procedure takes a while to download system updates and |product|
packages, then it runs the system configuration.

The complete procedure log is written to
:file:`/root/nethserver-enterprise-install/install.log`.

.. _installation-next-steps:

Expand Down
34 changes: 22 additions & 12 deletions administrator-manual/en/locale/es/LC_MESSAGES/accounts.po
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: NethServer Enterprise 7\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-04-04 10:23+0200\n"
"POT-Creation-Date: 2019-07-17 16:50+0200\n"
"PO-Revision-Date: 2017-02-06 15:30+0000\n"
"Last-Translator: Jon M., 2017\n"
"Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"
Expand Down Expand Up @@ -1108,23 +1108,23 @@ msgstr ""
"Es posible crear cuentas de usuario desde un archivo TSV (Tab Separated "
"Values, valores separados por tabulación) con el siguiente formato: ::"

#: ../../accounts.rst:544 ../../accounts.rst:587
#: ../../accounts.rst:544 ../../accounts.rst:577 ../../accounts.rst:605
msgid "Example: ::"
msgstr "Ejemplo: ::"

#: ../../accounts.rst:548 ../../accounts.rst:591
#: ../../accounts.rst:548 ../../accounts.rst:582 ../../accounts.rst:609
msgid "then execute: ::"
msgstr "Luego ejecutar: ::"

#: ../../accounts.rst:552 ../../accounts.rst:598
#: ../../accounts.rst:552 ../../accounts.rst:616
msgid ""
"For example, if the user’s file is /root/users.tsv, execute following "
"command: ::"
msgstr ""
"Por ejemplo, si el archivo del usuario es /root/users.tsv, ejecute el "
"siguiente comando: ::"

#: ../../accounts.rst:556 ../../accounts.rst:602
#: ../../accounts.rst:556 ../../accounts.rst:620
msgid "Alternative separator character: ::"
msgstr "Carácter de separador alternativo: ::"

Expand Down Expand Up @@ -1154,22 +1154,32 @@ msgstr ""

#: ../../accounts.rst:572
msgid ""
"Group management is available from the command line through ``group-create``"
" and ``group-modify`` events ::"
"It is possible to create groups from a TSV (Tab Separated Values) file with "
"the following format: ::"
msgstr ""

#: ../../accounts.rst:586
msgid ""
"For example, if the group file is ``/root/groups.tsv``, execute following "
"command: ::"
msgstr ""
"La gestión de grupos está disponible desde la línea de comandos a través de "
"los eventos ``group-create`` y ``group-modify`` ::"

#: ../../accounts.rst:578
#: ../../accounts.rst:590
msgid ""
"Group management is also available from the command line through ``group-"
"create`` and ``group-modify`` events ::"
msgstr ""

#: ../../accounts.rst:596
msgid "Delete users"
msgstr ""

#: ../../accounts.rst:580
#: ../../accounts.rst:598
msgid ""
"It is possible to delete user accounts from a file with the following "
"format: ::"
msgstr ""

#: ../../accounts.rst:596
#: ../../accounts.rst:614
msgid "You can also use the same import users file to delete the users."
msgstr ""
33 changes: 26 additions & 7 deletions administrator-manual/en/locale/es/LC_MESSAGES/installation.po
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: NethServer Enterprise 7\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-08 11:13+0200\n"
"POT-Creation-Date: 2019-07-17 16:50+0200\n"
"PO-Revision-Date: 2017-02-06 15:30+0000\n"
"Last-Translator: Jon M., 2017\n"
"Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"
Expand Down Expand Up @@ -568,20 +568,39 @@ msgstr ""
"::"

#: ../../installation.rst:303
msgid "Simply type the following command: ::"
msgid ""
"Access Nethesis Operation Center and `create a new server "
"<https://my.nethesis.it/#/servers?action=newServer>`_."
msgstr ""

#: ../../installation.rst:305
msgid ""
"Copy the secret token and run the following command in a CentOS command "
"shell, replacing ``<SECRET>`` with the copied token: ::"
msgstr ""

#: ../../installation.rst:309
msgid ""
"For instance, after replacing ``<SECRET>`` the command might look like ::"
msgstr ""

#: ../../installation.rst:313
msgid ""
"The procedure takes a while to download system updates and |product| "
"packages, then it runs the system configuration."
msgstr ""

#: ../../installation.rst:307
#: ../../installation.rst:316
msgid ""
"Installation log is saved inside ``/tmp/nethserver-enterprise-"
"install/install.log`` file."
"The complete procedure log is written to :file:`/root/nethserver-enterprise-"
"install/install.log`."
msgstr ""

#: ../../installation.rst:312
#: ../../installation.rst:322
msgid "Next steps"
msgstr "Próximos pasos"

#: ../../installation.rst:314
#: ../../installation.rst:324
msgid ""
"At the end of the installation procedure, :ref:`access the server-manager "
"<access-section>` to :ref:`install additional software <package_manager-"
Expand Down
4 changes: 2 additions & 2 deletions administrator-manual/en/locale/es/LC_MESSAGES/mail.po
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: NethServer Enterprise 7\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-08 11:13+0200\n"
"POT-Creation-Date: 2019-07-17 16:50+0200\n"
"PO-Revision-Date: 2017-02-06 15:30+0000\n"
"Last-Translator: Jon M., 2018\n"
"Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"
Expand Down Expand Up @@ -853,7 +853,7 @@ msgid ""
msgstr ""

#: ../../mail.rst:477
msgid "Anti-virus checks are enforced despite *whitelist* settings."
msgid "**Anti-virus checks are disabled** too, in case *whitelist* settings."
msgstr ""

#: ../../mail.rst:482
Expand Down

0 comments on commit 34f412a

Please sign in to comment.