X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=static%2Fsettings.config.php;h=fd07c5d26212c15107e790c4326e7be1cce3d7e1;hb=7dd757b7f974c9d9d9e91ab394a4f52cca327646;hp=bf74e782e4f42cad9524bce417fa8f1de0f085f1;hpb=38196aec674ca9acc5db7e72898b52906f0d9070;p=friendica.git

diff --git a/static/settings.config.php b/static/settings.config.php
index bf74e782e4..fd07c5d262 100644
--- a/static/settings.config.php
+++ b/static/settings.config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -64,6 +64,10 @@ return [
 		// Themes users can change to in their settings.
 		'allowed_themes' => 'frio,quattro,vier,duepuntozero,smoothly',
 
+		// cache_contact_avatar (Boolean)
+		// Cache versions of the contact avatars. Uses a lot of storage space
+		'cache_contact_avatar' => true,
+
 		// curl_timeout (Integer)
 		// Value is in seconds. Set to 0 for unlimited (not recommended).
 		'curl_timeout' =>  60,
@@ -144,10 +148,6 @@ return [
 		// Maximum system load before delivery and poll processes are deferred.
 		'maxloadavg' => 20,
 
-		// maxloadavg_frontend (Integer)
-		// Maximum system load before the frontend quits service - default 50.
-		'maxloadavg_frontend' => 50,
-
 		// min_memory (Integer)
 		// Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 (deactivated).
 		'min_memory' => 0,
@@ -164,9 +164,17 @@ return [
 		// Comma separated list of tags that are rejected.
 		'relay_deny_tags' => '',
 
-		// relay_server (String)
-		// Address of the relay server where public posts should be send to.
-		'relay_server' => 'https://social-relay.isurf.ca',
+		// 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,
+
+		// relay_scope (Relay::SCOPE_NONE, Relay::SCOPE_TAGS or Relay::SCOPE_ALL)
+		// Defines the scope of accepted posts from the relay servers
+		'relay_scope' => '',
 
 		// relay_server_tags (String)
 		// Comma separated list of tags for the "tags" subscription.
@@ -176,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' => '',
@@ -199,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',
+	],
 ];