From 506ac1efe025f5d9f7cffb017bdbb75caa15d1a7 Mon Sep 17 00:00:00 2001 From: SpamReceiver Date: Fri, 5 Aug 2022 20:28:18 +0200 Subject: [PATCH 1/2] Solution for #6889 See also: nextcloud/documentation#7046 Signed-off-by: SpamReceiver --- config/config.sample.php | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/config/config.sample.php b/config/config.sample.php index 025cf1105a01a..79c4464290603 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -656,25 +656,39 @@ * for when files and folders in the trash bin will be permanently deleted. * The app allows for two settings, a minimum time for trash bin retention, * and a maximum time for trash bin retention. + * * Minimum time is the number of days a file will be kept, after which it - * may be deleted. Maximum time is the number of days at which it is guaranteed - * to be deleted. + * _may be_ deleted. A file may be deleted after the minimum number of days + * is expired if space is needed. The file will not be deleted if space is + * not needed. + * + * Whether "space is needed" depends on whether a user quota is defined or not: + * + * * If no user quota is defined, the available space on the Nextcloud data + * partition sets the limit for the trashbin + * (issues: see https://github.com/nextcloud/server/issues/28451). + * * If a user quota is defined, 50% of the user's remaining quota space sets + * the limit for the trashbin. + * + * Maximum time is the number of days at which it is _guaranteed + * to be_ deleted. There is no further depenency on the available space. + * * Both minimum and maximum times can be set together to explicitly define * file and folder deletion. For migration purposes, this setting is installed * initially set to "auto", which is equivalent to the default setting in * Nextcloud. * - * Available values: + * Available values (D1 and D2 are configurable numbers): * * * ``auto`` * default setting. keeps files and folders in the trash bin for 30 days * and automatically deletes anytime after that if space is needed (note: * files may not be deleted if space is not needed). - * * ``D, auto`` - * keeps files and folders in the trash bin for D+ days, delete anytime if + * * ``D1, auto`` + * keeps files and folders in the trash bin for D1+ days, delete anytime if * space needed (note: files may not be deleted if space is not needed) - * * ``auto, D`` - * delete all files in the trash bin that are older than D days + * * ``auto, D2`` + * delete all files in the trash bin that are older than D2 days * automatically, delete other files anytime if space needed * * ``D1, D2`` * keep files and folders in the trash bin for at least D1 days and From de2bb79b6bc631afd27edcb985656439a9316083 Mon Sep 17 00:00:00 2001 From: Simon L Date: Sun, 21 Aug 2022 12:17:25 +0200 Subject: [PATCH 2/2] address review Signed-off-by: szaimen Co-authored-by: Vincent Petry --- config/config.sample.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.sample.php b/config/config.sample.php index 79c4464290603..a1cdb071dce9f 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -671,7 +671,7 @@ * the limit for the trashbin. * * Maximum time is the number of days at which it is _guaranteed - * to be_ deleted. There is no further depenency on the available space. + * to be_ deleted. There is no further dependency on the available space. * * Both minimum and maximum times can be set together to explicitly define * file and folder deletion. For migration purposes, this setting is installed