Merge branch '2020.09-rc' into stable

[friendica.git] / static / defaults.config.php

diff --git a/static/defaults.config.php b/static/defaults.config.php
index b711345064a59cba129e793519b80b1d0b363e4b..c1d6fff044e518206e1ed01f282f643013a9ec69 100644 (file)
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@ -62,6 +62,13 @@ return [
                // disable_pdo (Boolean)
                // PDO is used by default (if available). Otherwise MySQLi will be used.
                'disable_pdo' => false,
+
+               // persistent (Boolean)
+               // This controls if the system should use persistent connections or not.
+               // Persistent connections increase the performance.
+               // On the other hand the number of open connections are higher,
+               // this will most likely increase the system load.
+               'persistent' => false,
        ],
        'config' => [
                // admin_email (Comma-separated list)
@@ -203,6 +210,10 @@ return [
                // Disable the polling of DFRN and OStatus contacts through onepoll.php.
                'disable_polling' => false,
 
+               // display_resharer (Boolean)
+               // Display the first resharer as icon and text on a reshared item.
+               'display_resharer' => false,
+
                // dlogfile (Path)
                // location of the developer log file.
                'dlogfile' => '',
@@ -296,6 +307,12 @@ return [
                // Maximum number of queue items for a single contact before subsequent messages are discarded.
                'max_contact_queue' => 500,
 
+               // max_csv_file_size (Integer)
+               // When uploading a CSV with account addresses to follow
+               // in the user settings, this controls the maximum file
+               // size of the upload file.
+               'max_csv_file_size' => 30720,
+
                // max_feed_items (Integer)
                // Maximum number of feed items that are fetched and processed. For unlimited items set to 0.
                'max_feed_items' => 20,
@@ -345,6 +362,10 @@ return [
                // Don't use OEmbed to fetch more information about a link.
                'no_oembed' => false,
 
+               // no_redirect_list (Array)
+               // List of domains where HTTP redirects should be ignored. 
+               'no_redirect_list' => [],
+
                // no_smilies (Boolean)
                // Don't show smilies.
                'no_smilies' => false,
@@ -388,10 +409,6 @@ return [
                // - 0 = every minute
                'pushpoll_frequency' => 3,
 
-               // queue_no_dead_check (Boolean)
-               // Ignore if the target contact or server seems to be dead during queue delivery.
-               'queue_no_dead_check' => false,
-
                // redis_host (String)
                // Host name of the redis daemon.
                'redis_host' => '127.0.0.1',
@@ -492,6 +509,11 @@ return [
                // Setting 0 would allow maximum worker queues at all times, which is not recommended.
                'worker_load_exponent' => 3,
 
+               // worker_multiple_fetch (Boolean)
+               // When activated, the worker fetches jobs for multiple workers (not only for itself).
+               // This is an experimental setting without knowing the performance impact.
+               'worker_multiple_fetch' => false,
+               
                // worker_defer_limit (Integer)
                // Per default the systems tries delivering for 15 times before dropping it.
                'worker_defer_limit' => 15,