Merge pull request #10968 from annando/api2

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

diff --git a/static/settings.config.php b/static/settings.config.php
index 5d9b430b190ee1e1f5fcef48d7cf435f4c6495ae..fd07c5d26212c15107e790c4326e7be1cce3d7e1 100644 (file)
--- a/static/settings.config.php
+++ b/static/settings.config.php
@@ -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,
@@ -172,9 +172,9 @@ return [
                // Directly transmit content to relay subscribers without using a relay server
                'relay_directly' => false,
 
-               // relay_scope (SR_SCOPE_NONE, SR_SCOPE_TAGS or SR_SCOPE_ALL)
+               // relay_scope (Relay::SCOPE_NONE, Relay::SCOPE_TAGS or Relay::SCOPE_ALL)
                // Defines the scope of accepted posts from the relay servers
-               'relay_scope' => SR_SCOPE_NONE,
+               'relay_scope' => '',
 
                // relay_server_tags (String)
                // Comma separated list of tags for the "tags" subscription.