Merge remote-tracking branch 'upstream/develop' into server-detection

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

diff --git a/static/defaults.config.php b/static/defaults.config.php
index dc0d4e887d840f731445edc405976c63532cba1e..8b2b223f6f2a4c6815e456098db93c4134e35014 100644 (file)
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -37,6 +37,11 @@ return [
                // Can be used instead of adding a port number to the hostname
                'port' => null,
 
+               // socket (String)
+                // Socket of the database server.
+                // Can be used instead of adding a socket location to the hostname
+                'socket' => '',
+
                // user (String)
                // Database user name. Please don't use "root".
                'username' => '',
@@ -113,10 +118,28 @@ return [
                // chose "Remember me" when logging in is considered logged out.
                'auth_cookie_lifetime' => 7,
 
+               // avatar_cache (Boolean)
+               // Cache avatar pictures as files (experimental)
+               'avatar_cache' => false,
+
+               // avatar_cache_path (String)
+               // File path to the avatar cache. Default is /(your basepath)/avatar/
+               // The value has to be an absolute path and has to end with a "/"
+               'avatar_cache_path' => '',
+
+               // avatar_cache_url (String)
+               // Base URL of the avatar cache. Default is http(s)://(your hostname)/avatar/
+               // The value has to start with the scheme and end with a "/"
+               'avatar_cache_url' => '',
+
                // big_emojis (Boolean)
                // Display "Emoji Only" posts in big.
                'big_emojis' => false,
 
+               // bulk_delivery (Boolean)
+               // Delivers AP messages in a bulk (experimental)
+               'bulk_delivery' => false,
+
                // block_local_dir (Boolean)
                // Deny public access to the local user directory.
                'block_local_dir' => false,
@@ -494,12 +517,24 @@ return [
                // If enabled, multiple linefeeds in items are stripped to a single one.
                'remove_multiplicated_lines' => false,
 
+               // runtime_ignore (Array)
+               // List of ignored commands for the runtime logging.
+               'runtime_ignore' => [],
+
+               // runtime_loglimit (Integer)
+               // The runtime is logged, When the program execution time is higher than this value.
+               'runtime_loglimit' => 0,
+       
                // sendmail_params (Boolean)
                // Normal sendmail command parameters will be added when the PHP mail() function is called for sending e-mails.
                // This ensures the Sender Email address setting is applied to the message envelope rather than the host's default address.
                // Set to false if your non-sendmail agent is incompatible, or to restore old behavior of using the host address.
                'sendmail_params' => true,
 
+               // set_creation_date (Boolean)
+               // When enabled, the user can enter a creation date when composing a post.
+               'set_creation_date' => false,
+
                // show_global_community_hint (Boolean)
                // When the global community page is enabled, use this option to display a hint above the stream, that this is a collection of all public top-level postings that arrive on your node.
                'show_global_community_hint' => false,
@@ -532,6 +567,10 @@ return [
                // Maximum number of posts that a user can send per month with the API. 0 to disable monthly throttling.
                'throttle_limit_month' => 0,
 
+               // transmit_pending_events (Boolean)
+               // Transmit pending events upon accepted contact request for forums
+               'transmit_pending_events' => false,
+
                // update_active_contacts (Boolean)
                // When activated, only public contacts will be activated regularly that are used for example in items or tags.
                'update_active_contacts' => false,
@@ -593,6 +632,17 @@ return [
                // Timeout in seconds for fetching the XRD links and other requests with an expected shorter timeout
                'xrd_timeout' => 20,
        ],
+       'proxy' => [
+               // forwarded_for_headers (String)
+               // A comma separated list of all allowed header values to retrieve the real client IP
+               // The headers are evaluated in order.
+               'forwarded_for_headers' => 'HTTP_X_FORWARDED_FOR',
+
+               // trusted_proxies (String)
+               // A comma separated list of all trusted proxies, which will get skipped during client IP retrieval
+               // IP ranges and CIDR notations are allowed
+               'trusted_proxies' => '',
+       ],
        'experimental' => [
                // exp_themes (Boolean)
                // Show experimental themes in user settings.
@@ -616,10 +666,6 @@ return [
                // Logs every call to /inbox as a JSON file in Friendica's temporary directory
                'ap_inbox_log' => false,
 
-               // show_direction (Boolean)
-               // Display if a post had been fetched or had been pushed towards our server
-               'show_direction' => false,
-
                // total_ap_delivery (Boolean)
                // Deliver via AP to every possible receiver and we suppress the delivery to these contacts with other protocols
                'total_ap_delivery' => false,