Skip to content

Commit

Permalink
Fixes #262 - Redacted ticket and user deletion
Browse files Browse the repository at this point in the history
  • Loading branch information
ralf401 committed Aug 22, 2023
1 parent 23b3ec8 commit 56261fe
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 18 deletions.
24 changes: 12 additions & 12 deletions appendix/configure-database-server.rst
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
Configure Database server
*************************

.. note::
.. note::

Parts of this page also applies to both supported database servers.
Parts of this page also applies to both supported database servers.
We can't provide a complete how to and will only enlighten the relevant parts for Zammad.

Within ``database.yml`` (``config/`` directory) you can define the allowed pool size.
Within ``database.yml`` (``config/`` directory) you can define the allowed pool size.
By default each Zammad process takes up to ``50`` connections (``pool: 50``).

This should be fairly enough for *every* use case.
If you experience database connection timeouts or similar pool errors, this usually
This should be fairly enough for *every* use case.
If you experience database connection timeouts or similar pool errors, this usually
indicates to other issues that are relevant to your PostgreSQL.

.. note::
Below only affects PostgreSQL-Servers. All relevant steps for MySQL are mentioned on

Below only affects PostgreSQL-Servers. All relevant steps for MySQL are mentioned on
:doc:`/prerequisites/software` because they're relevant *before* installation.

Below you can the locations of the relevant PostgreSQL configuration files to adjust.
Below you can the locations of the relevant PostgreSQL configuration files to adjust.
Keep in mind that versions may differ from your setup - adapt where needed.

.. tabs::
Expand All @@ -27,7 +27,7 @@ Keep in mind that versions may differ from your setup - adapt where needed.

.. code-block::
/etc/postgresql/(10|11|12)/main/postgresql.conf
/etc/postgresql/{your version}/main/postgresql.conf
.. tab:: CentOS / OpenSUSE

Expand All @@ -37,7 +37,7 @@ Keep in mind that versions may differ from your setup - adapt where needed.
.. tab:: other

Can't find your configuration files?
Can't find your configuration files?
You can run the following command to get the path:

.. code-block:: sh
Expand All @@ -56,9 +56,9 @@ Adjust ``max_connections`` (mandatory)
$ systemctl restart postgresql zammad
Adjust PostgreSQL for bigger instances (optional)
.. warning::
.. warning::

Check below settings first and ensure your system is able to provide the requirements!
Check below settings first and ensure your system is able to provide the requirements!
Below settings are what we found to be useful, everything else is out of scope of this documentation!

.. code-block:: sh
Expand Down
13 changes: 7 additions & 6 deletions appendix/privacy.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ The following kinds of data are stored locally on the production system:
Tickets and users
By default, Zammad never automatically deletes tickets or users.

To enable automatic deletion of tickets after a given interval,
To enable **automatic** deletion of tickets after a given interval,
`use the scheduler <https://admin-docs.zammad.org/en/latest/manage-scheduler.html>`_.
To manually delete users and all their associated tickets
(*e.g.,* in compliance with a “Right to Forget” request under the GDPR),
:doc:`use the console </admin/console/dangerzone-for-experts>`.

.. note:: The ability to delete users via the admin panel
is planned for a future release of Zammad.
To **manually** delete users and all their associated tickets
(*e.g.* in compliance with a “Right to Forget” request under the GDPR),
you can use the
`data privacy functions <https://admin-docs.zammad.org/en/latest/system/data-privacy.html>`_
in the admin panel or
:doc:`use the console </admin/console/dangerzone-for-experts>`.

Chat sessions
Once a chat session has been marked **closed**,
Expand Down

0 comments on commit 56261fe

Please sign in to comment.