Merge pull request #1898 from nextcloud/backport/1896/stable17

[stable17] clarified trash bin retention by storage shortage override
This commit is contained in:
John Molakvoæ 2020-03-23 18:12:56 +01:00 committed by GitHub
commit 7473745fe8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions

View File

@ -683,7 +683,7 @@ Available values:
automatically, delete other files anytime if space needed
* ``D1, D2``
keep files and folders in the trash bin for at least D1 days and
delete when exceeds D2 days
delete when exceeds D2 days (note: files will not be deleted automatically if space is needed)
* ``disabled``
trash bin auto clean disabled, files and folders will be kept forever

View File

@ -54,3 +54,7 @@ by setting the ``trashbin_retention_obligation`` value. Files older than the
Additionally, Nextcloud calculates the maximum available space every time a new
file is added. If the deleted files exceed the new maximum allowed space
Nextcloud will expire old deleted files until the limit is met once again.
.. note:: Your administrator may have configured the trash bin retention period
to override the storage space management. See `admin documentation
<https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/config_sample_php_parameters.html#deleted-items-trash-bin>`_ for more details.

View File

@ -29,8 +29,12 @@ trash bin is set at 50% of quota. Deleted file aging is set at 30 days. When
deleted files exceed 50% of quota then the oldest files are removed until the
total is below 50%.
.. note:: Your administrator may have configured the trash bin retention period
to override the storage space management. See `admin documentation
<https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/config_sample_php_parameters.html#deleted-items-trash-bin>`_ for more details.
When version control is enabled, the older file versions are not counted against
quotas.
If you create a public share via URL, and allow uploads, any uploaded files
If you create a public share via URL and allow uploads, any uploaded files
count against your quota.