Merge pull request #7089 from nupplaphil/task/mod_help

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

diff --git a/config/defaults.config.php b/config/defaults.config.php
index c1ecbb42179c3e53dbfe0ab079f0c730ff8e52ee..b4471af25caf81b1bf437dbf31637bafd83f1fe8 100644 (file)
--- a/config/defaults.config.php
+++ b/config/defaults.config.php
@@ -72,6 +72,10 @@ return [
                // Deny public access to the local user directory.
                'block_local_dir' => false,
 
+               // cron_interval (Integer)
+               // Minimal period in minutes between two calls of the "Cron" worker job.
+               'cron_interval' => 5,
+
                // cache_driver (database|memcache|memcached|redis)
                // Whether to use Memcache or Memcached or Redis to store temporary cache.
                'cache_driver' => 'database',
@@ -135,6 +139,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 +218,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,
@@ -326,6 +343,14 @@ return [
                // Port number of the redis daemon.
                'redis_port' => 6379,
 
+               // redis_db (Integer)
+               // The sub-database of redis (0 - 15 possible sub-databases)
+               'redis_db' => 0,
+
+               // redis_password (String)
+               // The authentication password for the redis database
+               'redis_password' => null,
+
                // session_handler (database|cache|native)
                // Whether to use Cache to store session data or to use PHP native session storage.
                'session_handler' => 'database',
@@ -364,11 +389,6 @@ return [
                // Maximum number of posts that a user can send per month with the API. 0 to disable monthly throttling.
                'throttle_limit_month' => 0,
 
-               // urlpath (String)
-               // If you are using a subdirectory of your domain you will need to put the relative path (from the root of your domain) here.
-               // For instance if your URL is 'http://example.com/directory/subdirectory', set urlpath to 'directory/subdirectory'.
-               'urlpath' => '',
-
                // username_min_length (Integer)
                // The minimum character length a username can be.
                // This length is check once the username has been trimmed and multiple spaces have been collapsed into one.