Merge pull request #6985 from tobiasd/20190408-vierprvmailmobile

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

diff --git a/config/defaults.config.php b/config/defaults.config.php
index f81e84b0afc20056cd9337f016843ba81d2b9e0a..0d9e55c7d92a5df34404a53be04d585faf3b24ce 100644 (file)
--- a/config/defaults.config.php
+++ b/config/defaults.config.php
@@ -135,6 +135,15 @@ return [
                // Disables the check if a mail address is in a valid format and can be resolved via DNS.
                'disable_email_validation' => false,
 
+               // disable_implicit_mentions (Boolean) since 2019.03
+               // Implicit mentions are mentions in the body of replies that are redundant in a thread-enabled system like Friendica.
+               // This config key disables the gathering of implicit mentions in incoming and outgoing posts.
+               // Also disables the default automatic removal of implicit mentions from the body of incoming posts.
+               // Also disables the default automatic addition of implicit mentions in the body of outgoing posts.
+               // Disabling implicit mentions also affects the "explicit_mentions" additional feature by limiting it
+               // to the replied-to post author mention in the comment boxes.
+               'disable_implicit_mentions' => false,
+
                // disable_url_validation (Boolean)
                // Disables the DNS lookup of an URL.
                'disable_url_validation' => false,
@@ -205,6 +214,10 @@ return [
                // If activated, all hashtags will point to the local server.
                'local_tags' => false,
 
+               // logger_config (String)
+               // Sets the logging adapter of Friendica globally (monolog, syslog, stream)
+               'logger_config' => 'stream',
+
                // max_batch_queue (Integer)
                // Maximum number of batched queue items for a single contact before subsequent messages are discarded.
                'max_batch_queue' => 1000,
@@ -397,9 +410,9 @@ return [
                // If enabled, it prints out the jobs per minute.
                'worker_jpm' => false,
 
-               // worker_jpm_limit (String)
+               // worker_jpm_range (String)
                // List of minutes for the jobs per minute (JPM) calculation
-               'worker_jpm_limit' => '1, 10, 60',
+               'worker_jpm_range' => '1, 10, 60',
 
                // worker_load_exponent (Integer)
                // Default 3, which allows only 25% of the maximum worker queues when server load reaches around 37% of maximum load.