Merge pull request #10409 from annando/api-link-header

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

diff --git a/static/defaults.config.php b/static/defaults.config.php
index ed0f8f871a32de45f97effcfc0a2c61d7f0c39bf..25a23bf9dd64a9cdcccaf99c2cad6bd677dbb6ca 100644 (file)
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -56,7 +56,7 @@ return [
                // pdo_emulate_prepares (Boolean)
                // If enabled, the builtin emulation for prepared statements is used.
                // This can be used as a workaround for the database error "Prepared statement needs to be re-prepared".
-               'pdo_emulate_prepares' => false,
+               'pdo_emulate_prepares' => true,
 
                // disable_pdo (Boolean)
                // PDO is used by default (if available). Otherwise MySQLi will be used.
@@ -121,6 +121,10 @@ return [
                // Deny public access to the local user directory.
                'block_local_dir' => false,
 
+               // blocked_tags (String)
+               // Comma separated list of hash tags that shouldn't be displayed in the trending tags
+               'blocked_tags' => '',
+
                // community_no_sharer (Boolean)
                // Don't display sharing accounts on the global community
                'community_no_sharer' => false,
@@ -194,6 +198,10 @@ return [
                // If it is not running and hadn't been terminated normally, it will be started automatically.
                'daemon_watchdog' => false,
 
+               // delete_sleeping_processes (Boolean)
+               // Periodically delete waiting database processes.
+               'delete_sleeping_processes' => false,
+
                // diaspora_test (Boolean)
                // For development only. Disables the message transfer.
                'diaspora_test' => false,
@@ -243,10 +251,6 @@ return [
                // Number of "free" searches when system => permit_crawling is enabled.
                'free_crawls' => 10,
 
-               // frontend_worker_timeout (Integer)
-               // Value in minutes after we think that a frontend task was killed by the webserver.
-               'frontend_worker_timeout' => 10,
-
                // groupedit_image_limit (Integer)
                // Number of contacts at which the group editor should switch from display the profile pictures of the contacts to only display the names.
                // This can alternatively be set on a per account basis in the pconfig table.
@@ -405,10 +409,6 @@ return [
                // Don't show smilies.
                'no_smilies' => false,
 
-               // optimize_items (Boolean)
-               // Triggers an SQL command to optimize the item table before expiring items.
-               'optimize_items' => false,
-
                // paranoia (Boolean)
                // Log out users if their IP address changed.
                'paranoia' => false,
@@ -539,7 +539,8 @@ return [
                'worker_fetch_limit' => 1,
 
                // worker_fork (Boolean)
-               // Experimental setting. use pcntl_fork to spawn a new worker process
+               // Experimental setting. Use pcntl_fork to spawn a new worker process.
+               // Does not work when "worker_multiple_fetch" is enabled (Needs more testing)
                'worker_fork' => false,
 
                // worker_jpm (Boolean)
@@ -559,6 +560,7 @@ return [
                // 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.
+               // Does not work when "worker_fork" is enabled (Needs more testing)
                'worker_multiple_fetch' => false,
                
                // worker_defer_limit (Integer)
@@ -568,6 +570,10 @@ return [
                // xrd_timeout (Integer)
                // Timeout in seconds for fetching the XRD links.
                'xrd_timeout' => 20,
+
+               // proxy_file_chmod (Octal Integer like 0640)
+               // If set, defines the files permissions for downloaded files in the /proxy/ directory, default is system-dependent
+               'proxy_file_chmod' => 0,
        ],
        'experimental' => [
                // exp_themes (Boolean)