Merge pull request #18065 from owncloud/new-trashbin-retention

New trashbin retention

1 files changed, 28 insertions, 10 deletions

diff --git a/config/config.sample.php b/config/config.sample.php
index 5c362e94250..047e7ccdd12 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -399,16 +399,34 @@ $CONFIG = array(
  */
 
 /**
- * When the trash bin app is enabled (default), this is the number of days a
- * file will be kept in the trash bin. Default is 30 days.
- */
-'trashbin_retention_obligation' => 30,
-
-/**
- * Disable or enable auto-expiration for the trash bin. By default
- * auto-expiration is enabled.
- */
-'trashbin_auto_expire' => true,
+ * If the trash bin app is enabled (default), this setting defines the policy
+ * 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.
+ * 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
+ * ownCloud 8.1 and before.
+ *
+ * Available values:
+ *   ``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 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
+ *                 automatically, delete other files anytime if space needed
+ * * ``D1, D2``    keep files and folders the in trash bin for at least D1 days
+ *                 and delete when exceeds D2 days
+ *   ``disabled``  trash bin auto clean disabled, files and folders will be
+ *                 kept forever
+ */
+'trashbin_retention_obligation' => 'auto',
 
 
 /**