Merge pull request #12674 from nupplaphil/bug/config_typesafe

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

diff --git a/static/defaults.config.php b/static/defaults.config.php
index a8fe5f8686436a599abaad4e2f645c6a95996d4f..a8fa44038d4ab093ad1377599e0d8f8288f976b6 100644 (file)
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -364,6 +364,11 @@ return [
                // If activated, all hashtags will point to the local server.
                'local_tags' => false,
 
+               // lock_driver (semaphore|database|memcache|memcached|redis|apcu)
+               // Whether to use semaphores, the database, Memcache, Memcached, Redis or APCu to handle locks.
+               // Default is auto detection which tries semaphores first, then falls back to the cache driver.
+               'lock_driver' => '',
+
                // logger_config (String)
                // Sets the logging adapter of Friendica globally (monolog, syslog, stream)
                'logger_config' => 'stream',
@@ -711,6 +716,13 @@ return [
                // Must be writable by the ejabberd process. if set then it will prevent the running of multiple processes.
                'lockpath' => '',
        ],
+       'diaspora' => [
+               // native_photos (Boolean)
+               // If enabled, photos to Diaspora will be transmitted via the "photo" element instead of embedding them to the body.
+               // This is some visual improvement over the embedding but comes with the cost of losing accessibility.
+               // Is is disabled by default until Diaspora eventually will work on issue https://github.com/diaspora/diaspora/issues/8297
+               'native_photos' => false,
+       ],
        'debug' => [
                // ap_inbox_log (Boolean)
                // Logs every call to /inbox as a JSON file in Friendica's temporary directory