summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/config.sample.php28
1 files changed, 21 insertions, 7 deletions
diff --git a/config/config.sample.php b/config/config.sample.php
index 025cf1105a0..79c44642906 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -656,25 +656,39 @@ $CONFIG = [
* 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
044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
<?xml version="1.0" encoding="UTF-8"?>
<project name="ownCloud" default="build">

 <!-- the target 'build' can be used by developers for command line builds -->
 <target name="build" depends="lint"/>

 <!-- php syntax analysis -->
 <target name="lint">
  <apply executable="php" failonerror="true">
   <arg value="-l" />

   <fileset dir="${basedir}">
    <include name="**/*.php" />
    <exclude name="**/3rdparty/**" />
    <exclude name="**/l10n/**" />
    <!-- modified / -->
   </fileset>

  </apply>

  <!-- this looks for @brief and @returns annotation in PHP files and fails if it found some -->
  <apply executable="egrep" failonerror="false" resultproperty="grepReturnCode">
    <arg value="-rsHn" />
    <arg value="@brief|@returns" />

    <fileset dir="${basedir}/build">
      <include name="**/*.php" />
      <exclude name="**/3rdparty/**" />
      <exclude name="**/l10n/**" />
    </fileset>
  </apply>

  <!-- fail if grep has found something -->
  <fail message="Please remove @returns and @brief annotations for PHPDoc (listed above)">
    <condition>
      <equals arg1="0" arg2="${grepReturnCode}"/>
    </condition>
  </fail>

 </target>
</project>