Skip to content

Commit

Permalink
Merge pull request #421 from DavidePrincipi/v7
Browse files Browse the repository at this point in the history
Merge master in v7
  • Loading branch information
DavidePrincipi committed Apr 12, 2019
2 parents 3dc1695 + 517835c commit 9e49a51
Show file tree
Hide file tree
Showing 121 changed files with 1,577 additions and 1,324 deletions.
24 changes: 23 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,28 @@ Use a spell checker program before submitting a pull request. For instance run :

hunspell -d en_US <filename>

Cockpit inline documentation
----------------------------

Cockpit can display inline documentation directly from the online manual
using the `system-doc API <https://nethserver.github.io/nethserver-cockpit/api/system-docs/>`_.
The paragraph to be served as inline documentation must be enclosed
inside a `container <http://docutils.sourceforge.net/docs/ref/rst/directives.html#container>`_ element.

The container must have a unique name in the form ``ui-<section>`` like ``ui-portforward-syntax``.

Example: ::

.. container:: ui-test-section

Text example

* **First element**: description of element
* **Second element**: can contain ``special text``


**Note**: the ``container`` element can't contain a title.

Conditional sections
--------------------

Expand Down Expand Up @@ -232,4 +254,4 @@ resources to Transifex by manually editing ``.tx/config``.
Upgrading developer manual
==========================

Developer manual is now hosted at https://github.com/NethServer/dev
Developer manual is now hosted at https://github.com/NethServer/dev
2 changes: 2 additions & 0 deletions administrator-manual/en/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
locale/sr
locale/tr
_static
nscom/_static/_static
2 changes: 2 additions & 0 deletions administrator-manual/en/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,11 @@ help:
@echo " doctest to run all doctests embedded in the documentation (if enabled)"

clean:
-find -name _static -type l -delete
-rm -rf $(BUILDDIR)/*

html:
ln -sf nscom/_static _static
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
Expand Down
56 changes: 47 additions & 9 deletions administrator-manual/en/accounts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ and groups` page.
See :ref:`admin-account-section` section for more details about default
administrative user and group.

.. warning:: The |product| OpenLDAP account provider does not fully support the
user password expiration. Refer to :ref:`effects-of-expired-password`
for more information

.. _ad-local-accounts-provider-section:

Samba Active Directory local provider installation
Expand Down Expand Up @@ -123,6 +127,12 @@ When all fields are filled, press the :guilabel:`Create domain` button.
The Active Directory configuration procedure might require some time to run.
It creates the Linux Container chroot, by downloading additional packages.

The Linux Container root directory is :file:`/var/lib/machines/nsdc/` and
requires the filesystem support to Posix ACLs. The default XFS filesystem has a
builtin support for Posix ACLs and no special configuration is required. For
other filesystems (i.e. EXT4) enable the ACLs as explained in :ref:`Shared
folders requirements <shared_folders_requirements-section>`.

At the end of the Active Directory configuration procedure, the |product| host
machine is automatically configured to join the Active Directory domain. Go to
the page :guilabel:`User and groups` to see the default accounts.
Expand Down Expand Up @@ -472,24 +482,52 @@ The default policy is :dfn:`strong`.
Expiration
----------

The :index:`password expiration` is enabled by default to 6 months from the time when the password is set.
The :index:`password expiration` is **NOT** enabled by default.

Each time a user changes his password, the date of the password change is
recorded and, if :guilabel:`Password expiration for users` option is enabled,
the password is considered expired when the :guilabel:`Maximum Password Age`
has elapsed.

.. note:: The system will refer to the date of the last password change,
if password is older than 6 months, the server will send an email to indicate that password has expired.
In this case you need to change the user password.
For example, if the last password change was made in January and the activation of the deadline in October,
the system will assume the password changed in January is expired, and notify the user.
For example, given that

- last password was set in January,
- in October the :guilabel:`Maximum Password Age` is set to ``180 days``
and :guilabel:`Password expiration for users` is enabled

thus the password is **immediately considered expired** (January + 180 days = June!).

.. _effects-of-expired-password:

Effects of expired passwords
----------------------------

After password expiration, the user is still able to read and send email messages.
.. warning:: **no email notification related to password expiration** is sent by the server!

The effects of an expired password depend on the configured accounts provider.

When a password is expired

* with ``Active Directory`` (both local and remote) a user **cannot authenticate** himself
**with any service**;
* with a |product| ``LDAP`` accounts provider (both local and remote) **some services ignore
the password expiration** and grant access in any case.

Examples of services that do not fully support the password expiration with |product| LDAP
accounts provider:

.. only:: nscom

- NextCloud
- WebTop (contacts and calendars are available)
- SOGo

.. only:: nsent

- NextCloud
- WebTop (contacts and calendars are available)

If |product| has an Active Directory account provider, the user cannot access
shared folders, printers (by Samba) and other domain computers.
...and other services that authenticate directly with LDAP

.. _import-users_section:

Expand Down
9 changes: 8 additions & 1 deletion administrator-manual/en/backup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,12 @@ Other restored configurations:
* Users and groups
* SSL certificates

.. note:: The root/admin password is not restored.
.. warning:: Do not restore a configuration backup from an old minor version into a newer version.
The backup should come from a |product| having the same operating system version of the new
installation.

E.g.: Avoid restoring a configuration backup from a 7.4.1708 installation on a new 7.6.1810 system,
as it may mead to unexpected results.

Steps to be executed:

Expand All @@ -476,6 +481,8 @@ Steps to be executed:

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
2 changes: 1 addition & 1 deletion administrator-manual/en/collabora.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ After virtual host configuration, obtain a valid HTTPS certificate via Let's Enc
from ``Server certificate`` section of Server Manager interface.

Usage
----
-----

Collabora Online will be automatically enabled in Nextcloud if the package ``nethserver-nextcloud``
is present when the virtual host is configured, otherwise you can enable with: ::
Expand Down
18 changes: 2 additions & 16 deletions administrator-manual/en/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@

copyright = u'%d, Nethesis Srl and the NethServer project contributors' % datetime.date.today().year

if 'READTHEDOCS_PROJECT' in os.environ and 'cockpit' in os.environ['READTHEDOCS_PROJECT']:
tags.add('cockpit')
elif not tags.has('nscom') and 'READTHEDOCS_PROJECT' in os.environ and 'enterprise' in os.environ['READTHEDOCS_PROJECT']:
if not tags.has('nscom') and 'READTHEDOCS_PROJECT' in os.environ and 'enterprise' in os.environ['READTHEDOCS_PROJECT']:
tags.add('nsent')
elif not tags.has('nsent'):
tags.add('nscom')
Expand Down Expand Up @@ -77,19 +75,7 @@

htmlhelp_basename = 'NethServer_enterprisedoc'

if tags.has("cockpit"):
project = u'NethServer'
html_title = u"%s %s" % (project, release)
html_theme = "traditional"
html_add_permalinks=""
rst_prolog="""
.. |product| replace:: NethServer
.. |download_site| replace:: `www.nethserver.org <http://www.nethserver.org/getting-started-with-nethserver/>`__
.. |ks_keyboard| replace:: :samp:`en`
.. |ks_timezone| replace:: :samp:`Greenwich`
.. |ks_language| replace:: :samp:`en_US`
"""
elif tags.has('nsent'):
if tags.has('nsent'):
templates_path = ['nsent/_templates']
project = u'NethServer Enterprise'
html_title = "%s %s" % (project, release)
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
@@ -1,12 +1,12 @@
# #-#-#-#-# access.pot (NethServer 7) #-#-#-#-#
# SOME DESCRIPTIVE TITLE.
# Copyright (C) 2018, Nethesis Srl and the NethServer project contributors
# Copyright (C) 2019, Nethesis Srl and the NethServer project contributors
# This file is distributed under the same license as the NethServer package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# #-#-#-#-# access.pot (NethServer Enterprise 7) #-#-#-#-#
# SOME DESCRIPTIVE TITLE.
# Copyright (C) 2018, Nethesis Srl and the NethServer project contributors
# Copyright (C) 2019, Nethesis Srl and the NethServer project contributors
# This file is distributed under the same license as the NethServer Enterprise package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
Expand All @@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: NethServer Enterprise 7\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-28 10:04+0100\n"
"POT-Creation-Date: 2019-03-26 09:43+0100\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 Down

0 comments on commit 9e49a51

Please sign in to comment.