Skip to content

Commit

Permalink
Merge pull request #582 from NethServer/master
Browse files Browse the repository at this point in the history
Merge into v7 branch
  • Loading branch information
gsanchietti committed Jun 22, 2021
2 parents c2dc0ae + 1006fe3 commit 92e723c
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
4 changes: 2 additions & 2 deletions administrator-manual/en/disaster_recovery.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ Other restored configurations:
If the original machine has some third-party repositories enabled, remember to install them before
proceeding with the restore.

.. note:: The root password is not restored.

New Server Manager
------------------

Expand Down Expand Up @@ -136,8 +138,6 @@ Please, follow below steps:

Please note that the disaster recovery should be always performed from a local media (eg. NFS or USB) to speed up the process.

.. note:: The root/admin password is not restored.

.. _restore-roles-section:

Restore network roles
Expand Down
4 changes: 2 additions & 2 deletions administrator-manual/en/nsent/_static/nethesis.css
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ h5 {
padding-left: 25px;
padding-right: 25px;
}
ul, ol {
list-style-type: square;
ul, ol, li{
list-style-type: square !important;
margin-bottom: 15px;
}
ul ul {
Expand Down
2 changes: 1 addition & 1 deletion administrator-manual/en/registration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Therefore, do not hand over the password :dfn:`root` end user.

Operation Center
================

The :dfn:`system id` uniquely identify the server and it is reported inside the details page of each server.
There are also two special buttons :guilabel:`Free key` and :guilabel:`Delete server`.

Expand Down
3 changes: 2 additions & 1 deletion administrator-manual/en/sandbox.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ Yomi mail sandbox
Yomi sandbox is an automated malware analysis system provided by `Yoroi <http://yoroi.company/>`_.

Every mail message received or sent by the server is analyzed by the mail filter.
If the message contains attachments, each attachment is sent to the sandbox.
If the message contains attachments of MIME type used to deliver malware the attached file
is uploaded to the sandbox for analysis.
Yomi analyzes the behavior of the file when executed inside a realistic but isolated environment
and return a confidence score.

Expand Down
2 changes: 1 addition & 1 deletion administrator-manual/en/virtual_machines.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ doesn't provide a Web interface for it.

Virtualization software can be installed and started using the command line, just execute: ::

yum install --setopt=base.enablegroups=1 @virtualization-hypervisor @virtualization-tools @virtualization-platform
yum -y install qemu-kvm libvirt virt-install libvirt-client
systemctl enable libvirtd
systemctl start libvirtd

Expand Down

0 comments on commit 92e723c

Please sign in to comment.