diff options
| author | Faraz Samapoor <f.samapoor@gmail.com> | 2023-06-27 19:07:09 +0330 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-27 19:07:09 +0330 |
| commit | bbfe2fb821f00713f46fd896a41dfc62cc02c31a (patch) | |
| tree | 22923a6d3a78f7f1d780e958ff118a669c6c8c63 /config | |
| parent | 8c64ccae01ef3143a47dcca0b7ddb115d601c2f1 (diff) | |
| parent | 266436b76788d14e061bbe1f013bc052edc8041f (diff) | |
| download | nextcloud-server-bbfe2fb821f00713f46fd896a41dfc62cc02c31a.tar.gz nextcloud-server-bbfe2fb821f00713f46fd896a41dfc62cc02c31a.zip | |
Merge branch 'master' into replace_strpos_calls_in_dav_app
Signed-off-by: Faraz Samapoor <f.samapoor@gmail.com>
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.sample.php | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 366b6fbbc75..5301a2bf811 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -290,6 +290,11 @@ $CONFIG = [ 'session_lifetime' => 60 * 60 * 24, /** + * The timeout in seconds for requests to servers made by the DAV component (e.g., needed for federated shares). + */ +'davstorage.request_timeout' => 30, + +/** * `true` enabled a relaxed session timeout, where the session timeout would no longer be * handled by Nextcloud but by either the PHP garbage collection or the expiration of * potential other session backends like redis. @@ -1238,8 +1243,9 @@ $CONFIG = [ * The following providers are disabled by default due to performance or privacy * concerns: * - * - ``OC\Preview\Illustrator`` + * - ``OC\Preview\Font`` * - ``OC\Preview\HEIC`` + * - ``OC\Preview\Illustrator`` * - ``OC\Preview\Movie`` * - ``OC\Preview\MSOffice2003`` * - ``OC\Preview\MSOffice2007`` @@ -1250,7 +1256,6 @@ $CONFIG = [ * - ``OC\Preview\StarOffice`` * - ``OC\Preview\SVG`` * - ``OC\Preview\TIFF`` - * - ``OC\Preview\Font`` * * * Defaults to the following providers: @@ -1258,25 +1263,25 @@ $CONFIG = [ * - ``OC\Preview\BMP`` * - ``OC\Preview\GIF`` * - ``OC\Preview\JPEG`` + * - ``OC\Preview\Krita`` * - ``OC\Preview\MarkDown`` * - ``OC\Preview\MP3`` + * - ``OC\Preview\OpenDocument`` * - ``OC\Preview\PNG`` * - ``OC\Preview\TXT`` * - ``OC\Preview\XBitmap`` - * - ``OC\Preview\OpenDocument`` - * - ``OC\Preview\Krita`` */ 'enabledPreviewProviders' => [ - 'OC\Preview\PNG', - 'OC\Preview\JPEG', - 'OC\Preview\GIF', 'OC\Preview\BMP', - 'OC\Preview\XBitmap', - 'OC\Preview\MP3', - 'OC\Preview\TXT', + 'OC\Preview\GIF', + 'OC\Preview\JPEG', + 'OC\Preview\Krita', 'OC\Preview\MarkDown', + 'OC\Preview\MP3', 'OC\Preview\OpenDocument', - 'OC\Preview\Krita', + 'OC\Preview\PNG', + 'OC\Preview\TXT', + 'OC\Preview\XBitmap', ], /** @@ -2155,6 +2160,11 @@ $CONFIG = [ 'upgrade.disable-web' => false, /** + * Allows to modify the cli-upgrade link in order to link to a different documentation + */ +'upgrade.cli-upgrade-link' => '', + +/** * Set this Nextcloud instance to debugging mode * * Only enable this for local development and not in production environments |