From 8db7343dda3fc4b1d83af34a54fe757917546827 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 4 Dec 2023 06:33:17 +0000 Subject: [PATCH] Default values are now at their correct places --- static/defaults.config.php | 62 ++++++-------------------------------- static/settings.config.php | 21 ++++++++----- 2 files changed, 23 insertions(+), 60 deletions(-) diff --git a/static/defaults.config.php b/static/defaults.config.php index 2e3e7f3e64..3eedd8a901 100644 --- a/static/defaults.config.php +++ b/static/defaults.config.php @@ -93,6 +93,10 @@ return [ 'php_path' => 'php', ], 'system' => [ + // add_missing_posts (boolean) + // Checks for missing entries in "post", "post-thread" or "post-thread-user" and creates them + 'add_missing_posts' => false, + // allowed_link_protocols (Array) // Allowed protocols in links URLs, add at your own risk. http(s) is always allowed. 'allowed_link_protocols' => ['ftp://', 'ftps://', 'mailto:', 'cid:', 'gopher://'], @@ -144,10 +148,6 @@ return [ // How many contacts should be checked at a time? 'contact_update_limit' => 100, - // cron_interval (Integer) - // Minimal period in minutes between two calls of the "Cron" worker job. - 'cron_interval' => 5, - // cache_driver (database|memcache|memcached|redis|apcu) // Whether to use Memcache, Memcached, Redis or APCu to store temporary cache. 'cache_driver' => 'database', @@ -250,10 +250,6 @@ return [ // Disable the exposition check against the remote haveibeenpwned API on password change. 'disable_password_exposed' => false, - // disable_polling (Boolean) - // Disable the polling of DFRN and OStatus contacts through onepoll.php. - 'disable_polling' => false, - // display_resharer (Boolean) // Display the first resharer as icon and text on a reshared item. 'display_resharer' => false, @@ -325,29 +321,10 @@ return [ // If set true registration is only possible after a current member of the node has sent an invitation. 'invitation_only' => false, - // itemspage_network (Integer) - // default number of items per page in stream pages (network, community, profile/contact statuses, search) - 'itemspage_network' => 40, - - // itemspage_network_mobile (Integer) - // default number of items per page in stream pages (network, community, profile/contact statuses, search) - // on detected mobile devices - 'itemspage_network_mobile' => 20, - - // jpeg_quality (Integer) - // - // Lower numbers save space at cost of image detail - // where n is between 1 and 100, and with very poor results below about 50 - 'jpeg_quality' => 100, - // like_no_comment (Boolean) // Don't update the "commented" value of an item when it is liked. 'like_no_comment' => false, - // local_block (Boolean) - // Used in conjunction with "block_public". - 'local_block' => false, - // local_tags (Boolean) // If activated, all hashtags will point to the local server. 'local_tags' => true, @@ -361,11 +338,11 @@ return [ // Sets the logging adapter of Friendica globally (monolog, syslog, stream) 'logger_config' => 'stream', - // syslog flags (Integer) + // syslog_flags (Integer) // Sets the syslog flags in case 'logger_config' is set to 'syslog' 'syslog_flags' => LOG_CONS | LOG_PID | LOG_ODELAY, - // syslog flags (Integer) + // syslog_facility (Integer) // Sets the syslog facility in case 'logger_config' is set to 'syslog' 'syslog_facility' => LOG_USER, @@ -379,10 +356,6 @@ return [ // The system timezone is used when no timezone is defined here. 'maintenance_end' => '03:00 +00:00', - // max_batch_queue (Integer) - // Maximum number of batched queue items for a single contact before subsequent messages are discarded. - 'max_batch_queue' => 1000, - // max_connections (Integer) // The maximum number of database connections which can be in use before the worker process is deferred to its next interval. // When the system can't detect the maximum numbers of connection then this value can be used. Use 0 for auto-detection. @@ -392,10 +365,6 @@ return [ // The maximum percentage of connections that are allowed to let the worker start. 'max_connections_level' => 75, - // max_contact_queue (Integer) - // Maximum number of queue items for a single contact before subsequent messages are discarded. - 'max_contact_queue' => 500, - // max_csv_file_size (Integer) // When uploading a CSV with account addresses to follow // in the user settings, this controls the maximum file @@ -425,14 +394,14 @@ return [ // Maximum number of concurrent database processes for foreground tasks. 'max_processes_frontend' => 20, + // max_receivers (Integer) + // The maximum number of displayed receivers of posts + 'max_receivers' => 10, + // max_recursion_depth (Integer) // Maximum recursion depth when fetching posts until the job is delegated to a worker task or finished. 'max_recursion_depth' => 50, - // maximagesize (Integer) - // Maximum size in bytes of an uploaded photo. - 'maximagesize' => 800000, - // memcache_host (String) // Host name of the memcache daemon. 'memcache_host' => '127.0.0.1', @@ -491,17 +460,6 @@ return [ // Enable internal timings to help optimize code. Needed for "rendertime" addon. 'profiler' => false, - // pushpoll_frequency (Integer) - // Frequency of contact poll for subhub contact using the DFRN or OStatus network. - // Available values: - // - 5 = every month - // - 4 = every week - // - 3 = every day - // - 2 = twice a day - // - 1 = every hour - // - 0 = every minute - 'pushpoll_frequency' => 3, - // redis_host (String) // Host name or the path to the Unix domain socket of the Redis daemon. 'redis_host' => '127.0.0.1', diff --git a/static/settings.config.php b/static/settings.config.php index 3c4672f8ac..578fdd268c 100644 --- a/static/settings.config.php +++ b/static/settings.config.php @@ -52,10 +52,6 @@ return [ // Enter 0 for no time limit. 'account_abandon_days' => 0, - // add_missing_posts (boolean) - // Checks for missing entries in "post", "post-thread" or "post-thread-user" and creates them - 'add_missing_posts' => false, - // adjust_poll_frequency (Boolean) // Automatically detect and set the best feed poll frequency. 'adjust_poll_frequency' => false, @@ -80,6 +76,10 @@ return [ // Cache versions of the contact avatars. Uses a lot of storage space 'cache_contact_avatar' => true, + // cron_interval (Integer) + // Minimal period in minutes between two calls of the "Cron" worker job. + 'cron_interval' => 5, + // curl_timeout (Integer) // Value is in seconds. Set to 0 for unlimited (not recommended). 'curl_timeout' => 60, @@ -134,6 +134,15 @@ return [ // Compute contact circle level when counting unseen network posts. 'compute_circle_counts' => true, + // itemspage_network (Integer) + // default number of items per page in stream pages (network, community, profile/contact statuses, search) + 'itemspage_network' => 40, + + // itemspage_network_mobile (Integer) + // default number of items per page in stream pages (network, community, profile/contact statuses, search) + // on detected mobile devices + 'itemspage_network_mobile' => 20, + // jpeg_quality (Integer) // Sets the ImageMagick quality level for JPEG images. Values ranges from 50 (awful) to 100 (near perfect). 'jpeg_quality' => 100, @@ -164,10 +173,6 @@ return [ // If you don't want to set a maximum length, set to -1. 'max_image_length' => -1, - // max_receivers (Integer) - // The maximum number of displayed receivers of posts - 'max_receivers' => 10, - // maximagesize (Integer) // Maximum size in bytes of an uploaded photo. 'maximagesize' => 800000, -- 2.39.5