Merge pull request #10793 from annando/issue-10747

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

diff --git a/static/settings.config.php b/static/settings.config.php
index e8c6d09f81eef735e58f6304b9c09c75d4b483f9..5d9b430b190ee1e1f5fcef48d7cf435f4c6495ae 100644 (file)
--- a/static/settings.config.php
+++ b/static/settings.config.php
@@ -164,6 +164,10 @@ return [
                // Comma separated list of tags that are rejected.
                'relay_deny_tags' => '',
 
+               // proxify_content (Boolean)
+               // Use the proxy functionality for fetching external content
+               'proxify_content' => true,
+
                // relay_directly (Boolean)
                // Directly transmit content to relay subscribers without using a relay server
                'relay_directly' => false,
@@ -180,12 +184,6 @@ return [
                // If enabled, the tags from the saved searches will used for the "tags" subscription in addition to the "relay_server_tags".
                'relay_user_tags' => true,
 
-               // rino_encrypt (Integer)
-               // Server-to-server private message encryption (RINO).
-               // Encryption will only be provided if this setting is set to a non zero value on both servers.
-               // Set to 0 to disable, 2 to enable, 1 is deprecated but won't need mcrypt.
-               'rino_encrypt' => 2,
-
                // temppath (String)
                // Custom temporary file directory
                'temppath' => '',
@@ -203,4 +201,11 @@ return [
        // Used in the admin settings to lock certain features
        'featurelock' => [
        ],
+
+       // Storage backend configuration
+       'storage' => [
+               // name (String)
+               // The name of the current used backend (default is Database)
+               'name' => 'Database',
+       ],
 ];