bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #9175 from annando/issue-8961

Browse source 
Issue 8961: Rearranged config defaults
This commit is contained in:
Hypolite Petovan 2020-09-09 13:58:07 -04:00 committed by GitHub
commit 3036b15b49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
static/defaults.config.php
View file

@ -210,6 +210,10 @@ return [
// Disable the polling of DFRN and OStatus contacts through onepoll.php. // Disable the polling of DFRN and OStatus contacts through onepoll.php.
'disable_polling' => false, 'disable_polling' => false,
// display_resharer (Boolean)
// Display the first resharer as icon and text on a reshared item.
'display_resharer' => false,
// dlogfile (Path) // dlogfile (Path)
// location of the developer log file. // location of the developer log file.
'dlogfile' => '', 'dlogfile' => '',
@ -303,6 +307,12 @@ return [
// Maximum number of queue items for a single contact before subsequent messages are discarded. // Maximum number of queue items for a single contact before subsequent messages are discarded.
'max_contact_queue' => 500, '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
// size of the upload file.
'max_csv_file_size' => 30720,
// max_feed_items (Integer) // max_feed_items (Integer)
// Maximum number of feed items that are fetched and processed. For unlimited items set to 0. // Maximum number of feed items that are fetched and processed. For unlimited items set to 0.
'max_feed_items' => 20, 'max_feed_items' => 20,
@ -395,10 +405,6 @@ return [
// - 0 = every minute // - 0 = every minute
'pushpoll_frequency' => 3, 'pushpoll_frequency' => 3,
// queue_no_dead_check (Boolean)
// Ignore if the target contact or server seems to be dead during queue delivery.
'queue_no_dead_check' => false,
// redis_host (String) // redis_host (String)
// Host name of the redis daemon. // Host name of the redis daemon.
'redis_host' => '127.0.0.1', 'redis_host' => '127.0.0.1',

10
static/settings.config.php
View file

@ -141,19 +141,9 @@ return [
// Used by the worker in a non-HTTP execution environment. // Used by the worker in a non-HTTP execution environment.
'url' => '', 'url' => '',
// max_csv_file_size (Integer)
// When uploading a CSV with account addresses to follow
// in the user settings, this controls the maximum file
// size of the upload file.
'max_csv_file_size' => 30720,
// optimize_tables (Boolean) // optimize_tables (Boolean)
// Periodically (once an hour) run an "optimize table" command for cache tables // Periodically (once an hour) run an "optimize table" command for cache tables
'optimize_tables' => false, 'optimize_tables' => false,
// display_resharer (Boolean)
// Display the first resharer as icon and text on a reshared item.
'display_resharer' => false,
], ],
// Used in the admin settings to lock certain features // Used in the admin settings to lock certain features