Merge remote-tracking branch 'upstream/develop' into baseurl

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

diff --git a/static/defaults.config.php b/static/defaults.config.php
index 273095315789606f13c5fc7f83ec9f0c542baab7..33ed8211b483949ec64e0717fa55c10c87fc3f1d 100644 (file)
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@ -543,11 +543,11 @@ return [
                'pushpoll_frequency' => 3,
 
                // redis_host (String)
-               // Host name of the redis daemon.
+               // Host name or the path to the Unix domain socket of the Redis daemon.
                'redis_host' => '127.0.0.1',
 
-               // redis_port (String)
-               // Port number of the redis daemon.
+               // redis_port (Integer)
+               // Port number of the Redis daemon, should be -1 for unix domain socket
                'redis_port' => 6379,
 
                // redis_db (Integer)
@@ -781,4 +781,19 @@ return [
                // By default the template cache is stored in several subdirectories.
                'use_sub_dirs' => true,
        ],
+       'api' => [
+               // mastodon_banner (String)
+               // Default banner image for Mastodon API, must be a relative path from the base Friendica folder
+               //
+               // Default picture credits:
+               // Author: Lostinlight <https://mastodon.xyz/@lightone>
+               // License: CC0 https://creativecommons.org/share-your-work/public-domain/cc0/
+               // Link to original work: https://gitlab.com/lostinlight/per_aspera_ad_astra/-/blob/master/friendica-404/friendica-promo-bubbles.jpg
+               'mastodon_banner' => '/images/friendica-banner.jpg',
+       ],
+       'blocklist' => [
+               // public (Boolean)
+               // Wether the blocklist is publicly listed under /about (or in any later API)
+               'public' => true,
+       ],
 ];