diff options
| author | MichaIng <micha@dietpi.com> | 2019-12-04 14:42:55 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-04 14:42:55 +0300 |
| commit | 4384806f616cf7b9f6a4492ba2fd094afd064f86 (patch) | |
| tree | c653df3fcea2c8fce6101d066e0bf42db8026d6e /config | |
| parent | 5afd7abf4481f019ad0044393b4734645e40f5af (diff) | |
| parent | 76b78edd40fcb5dbe7f0434cbc41d2e291acfec1 (diff) | |
Merge branch 'master' into patch-1
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.sample.php | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index f939fc371b7..d998ce560bc 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -357,8 +357,8 @@ $CONFIG = array( 'mail_smtptimeout' => 10, /** - * This depends on ``mail_smtpmode``. Specify when you are using ``ssl`` or - * ``tls``, or leave empty for no encryption. + * This depends on ``mail_smtpmode``. Specify when you are using ``ssl`` for SSL/TLS or + * ``tls`` for STARTTLS, or leave empty for no encryption. * * Defaults to ``''`` (empty string) */ @@ -1481,6 +1481,17 @@ $CONFIG = array( 'quota_include_external_storage' => false, /** + * When an external storage is unavailable for some reasons, it will be flagged + * as such for 10 minutes. When the trigger is a failed authentication attempt + * the delay is higher and can be controlled with this option. The motivation + * is to make account lock outs at Active Directories (and compatible) more + * unlikely. + * + * Defaults to ``1800`` (seconds) + */ +'external_storage.auth_availability_delay' => 1800, + +/** * Specifies how often the local filesystem (the Nextcloud data/ directory, and * NFS mounts in data/) is checked for changes made outside Nextcloud. This * does not apply to external storages. |