diff options
author | Christian Wolf <github@christianwolf.email> | 2022-12-25 13:04:05 +0100 |
---|---|---|
committer | Christian Wolf <github@christianwolf.email> | 2022-12-27 10:01:05 +0100 |
commit | 7e46f033b6d6e495e430e8537105b8fa60d52b00 (patch) | |
tree | 62779c61f11fa1bed11a511e876222475031156d /config/config.sample.php | |
parent | 6765c3e0de75cc3646160617312d91e3bc2078e0 (diff) | |
download | nextcloud-server-7e46f033b6d6e495e430e8537105b8fa60d52b00.tar.gz nextcloud-server-7e46f033b6d6e495e430e8537105b8fa60d52b00.zip |
Reorder the sample config file in order to have a cleaner structure and better sectioning in the online manual
The change should only affect the conmments and reorder the config lines
Copy modifications from https://github.com/nextcloud/documentation/pull/9166 into sample config file
Signed-off-by: Christian Wolf <github@christianwolf.email>
Diffstat (limited to 'config/config.sample.php')
-rw-r--r-- | config/config.sample.php | 114 |
1 files changed, 57 insertions, 57 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index bc38a9f5444..f54091227a2 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -675,7 +675,7 @@ $CONFIG = [ * 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. A file may be deleted after the minimum number of days + * *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. * @@ -687,8 +687,8 @@ $CONFIG = [ * * 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 dependency on the available space. + * Maximum time is the number of days at which it is *guaranteed + * 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 @@ -1665,6 +1665,14 @@ $CONFIG = [ 'sharing.allow_custom_share_folder' => true, /** + * Define a default folder for shared files and folders other than root. + * Changes to this value will only have effect on new shares. + * + * Defaults to ``/`` + */ +'share_folder' => '/', + +/** * Set to ``false``, to stop sending a mail when users receive a share */ 'sharing.enable_share_mail' => true, @@ -1683,6 +1691,52 @@ $CONFIG = [ 'transferIncomingShares' => false, /** + * Hashing + */ + +/** + * By default, Nextcloud will use the Argon2 password hashing if available. + * However, if for whatever reason you want to stick with the PASSWORD_DEFAULT + * of your php version. Then set the setting to true. + */ +'hashing_default_password' => false, + +/** + * + * Nextcloud uses the Argon2 algorithm (with PHP >= 7.2) to create hashes by its + * own and exposes its configuration options as following. More information can + * be found at: https://www.php.net/manual/en/function.password-hash.php + */ + +/** + * The number of CPU threads to be used by the algorithm for computing a hash. + * The value must be an integer, and the minimum value is 1. Rationally it does + * not help to provide a number higher than the available threads on the machine. + * Values that undershoot the minimum will be ignored in favor of the minimum. + */ +'hashingThreads' => PASSWORD_ARGON2_DEFAULT_THREADS, + +/** + * The memory in KiB to be used by the algorithm for computing a hash. The value + * must be an integer, and the minimum value is 8 times the number of CPU threads. + * Values that undershoot the minimum will be ignored in favor of the minimum. + */ +'hashingMemoryCost' => PASSWORD_ARGON2_DEFAULT_MEMORY_COST, + +/** + * The number of iterations that are used by the algorithm for computing a hash. + * The value must be an integer, and the minimum value is 1. Values that + * undershoot the minimum will be ignored in favor of the minimum. + */ +'hashingTimeCost' => PASSWORD_ARGON2_DEFAULT_TIME_COST, + +/** + * The hashing cost used by hashes generated by Nextcloud + * Using a higher value requires more time and CPU power to calculate the hashes + */ +'hashingCost' => 10, + +/** * All other configuration options */ @@ -1803,52 +1857,6 @@ $CONFIG = [ 'updatedirectory' => '', /** - * Hashing - */ - -/** - * By default, Nextcloud will use the Argon2 password hashing if available. - * However, if for whatever reason you want to stick with the PASSWORD_DEFAULT - * of your php version. Then set the setting to true. - */ -'hashing_default_password' => false, - -/** - * - * Nextcloud uses the Argon2 algorithm (with PHP >= 7.2) to create hashes by its - * own and exposes its configuration options as following. More information can - * be found at: https://www.php.net/manual/en/function.password-hash.php - */ - -/** - * The number of CPU threads to be used by the algorithm for computing a hash. - * The value must be an integer, and the minimum value is 1. Rationally it does - * not help to provide a number higher than the available threads on the machine. - * Values that undershoot the minimum will be ignored in favor of the minimum. - */ -'hashingThreads' => PASSWORD_ARGON2_DEFAULT_THREADS, - -/** - * The memory in KiB to be used by the algorithm for computing a hash. The value - * must be an integer, and the minimum value is 8 times the number of CPU threads. - * Values that undershoot the minimum will be ignored in favor of the minimum. - */ -'hashingMemoryCost' => PASSWORD_ARGON2_DEFAULT_MEMORY_COST, - -/** - * The number of iterations that are used by the algorithm for computing a hash. - * The value must be an integer, and the minimum value is 1. Values that - * undershoot the minimum will be ignored in favor of the minimum. - */ -'hashingTimeCost' => PASSWORD_ARGON2_DEFAULT_TIME_COST, - -/** - * The hashing cost used by hashes generated by Nextcloud - * Using a higher value requires more time and CPU power to calculate the hashes - */ -'hashingCost' => 10, - -/** * Blacklist a specific file or files and disallow the upload of files * with this name. ``.htaccess`` is blocked by default. * WARNING: USE THIS ONLY IF YOU KNOW WHAT YOU ARE DOING. @@ -1858,14 +1866,6 @@ $CONFIG = [ 'blacklisted_files' => ['.htaccess'], /** - * Define a default folder for shared files and folders other than root. - * Changes to this value will only have effect on new shares. - * - * Defaults to ``/`` - */ -'share_folder' => '/', - -/** * If you are applying a theme to Nextcloud, enter the name of the theme here. * The default location for themes is ``nextcloud/themes/``. * |