Merge pull request #9849 from annando/user-item

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

diff --git a/static/settings.config.php b/static/settings.config.php
index 29f57f4..c05e675 100644 (file)
--- a/static/settings.config.php
+++ b/static/settings.config.php
@@ -60,6 +60,30 @@ return [
                // Themes users can change to in their settings.
                'allowed_themes' => 'quattro,vier,duepuntozero,smoothly',
 
+               // curl_timeout (Integer)
+               // Value is in seconds. Set to 0 for unlimited (not recommended).
+               'curl_timeout' =>  60,
+
+               // dbclean (Boolean)
+               // Remove old remote items, orphaned database records and old content from some other helper tables.
+               'dbclean' => false,
+
+               // dbclean-expire-days (Integer)
+               // When the database cleanup is enabled, this defines the days after which remote items will be deleted.
+               // Own items, and marked or filed items are always kept. 0 disables this behaviour.
+               'dbclean-expire-days' => 0,
+
+               // dbclean-expire-unclaimed (Integer)
+               // When the database cleanup is enabled, this defines the days after which unclaimed remote items
+               // (mostly content from the relay) will be deleted. Default value is 90 days. Defaults to the general
+               // lifespan value of remote items if set to 0.
+               'dbclean-expire-unclaimed' => 90,
+
+               // dbclean_expire_conversation (Integer)
+               // The conversation data is used for ActivityPub and OStatus, as well as for debug purposes.
+               // It should be safe to remove it after 14 days, default is 90 days.
+               'dbclean_expire_conversation' => 90,
+
                // debugging (boolean)
                // Enable/Disable Debugging (logging)
                'debugging' => false,
@@ -73,6 +97,10 @@ return [
                // URL of the global directory.
                'directory' => 'https://dir.friendica.social',
 
+               // explicit_content (Boolean)
+               // Set this to announce that your node is used mostly for explicit content that might not be suited for minors.
+               'explicit_content' => false,
+
                // forbidden_nicknames (Comma-separated list)
                // Prevents users from registering the specified nicknames on this node.
                // Default value comprises classic role names from RFC 2142.
@@ -108,24 +136,42 @@ return [
                // Maximum size in bytes of an uploaded photo.
                'maximagesize' => 800000,
 
+               // maxloadavg (Integer)
+               // 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,
+
                // no_regfullname (Boolean)
                // Allow pseudonyms (true) or enforce a space between first name and last name in Full name, as an anti spam measure (false).
                'no_regfullname' => true,
 
-               // optimize_max_tablesize (Integer)
-               // Maximum table size (in MB) for the automatic optimization.
-               // -1 to disable automatic optimization.
-               //  0 to use internal default (100MB)
-               'optimize_max_tablesize' => -1,
+               // optimize_tables (Boolean)
+               // Periodically (once an hour) run an "optimize table" command for cache tables
+               'optimize_tables' => false,
 
-               // maxloadavg (Integer)
-               // Maximum system load before delivery and poll processes are deferred.
-               'maxloadavg' => 20,
+               // relay_deny_tags (String)
+               // 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',
 
+               // relay_server_tags (String)
+               // Comma separated list of tags for the "tags" subscription.
+               'relay_server_tags' => '',
+
+               // relay_user_tags (Boolean)
+               // 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.
@@ -144,10 +190,6 @@ return [
                // The fully-qualified URL of this Friendica node.
                // Used by the worker in a non-HTTP execution environment.
                'url' => '',
-
-               // optimize_tables (Boolean)
-               // Periodically (once an hour) run an "optimize table" command for cache tables
-               'optimize_tables' => false,
        ],
 
        // Used in the admin settings to lock certain features