Merge pull request #9175 from annando/issue-8961

Issue 8961: Rearranged config defaults

diff --git a/static/defaults.config.php b/static/defaults.config.php
index 4d595010ce5f92525560d86883be14b78c508a7b..35b1bc7b8700170cce785ca44a901219aef8a460 100644 (file)
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@ -210,6 +210,10 @@ return [
                // 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,
+
                // dlogfile (Path)
                // location of the developer log file.
                'dlogfile' => '',
@@ -303,6 +307,12 @@ return [
                // 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
+               // size of the upload file.
+               'max_csv_file_size' => 30720,
+
                // max_feed_items (Integer)
                // Maximum number of feed items that are fetched and processed. For unlimited items set to 0.
                'max_feed_items' => 20,
@@ -395,10 +405,6 @@ return [
                // - 0 = every minute
                '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)
                // Host name of the redis daemon.
                'redis_host' => '127.0.0.1',

diff --git a/static/settings.config.php b/static/settings.config.php
index 9c4e739f08b56d5d5619ff7aeda50ca07c85adba..9dfd963b0bf2f8792b882f49a65a6705b0320bcb 100644 (file)
--- a/static/settings.config.php
+++ b/static/settings.config.php
@@ -141,19 +141,9 @@ return [
                // Used by the worker in a non-HTTP execution environment.
                '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)
                // Periodically (once an hour) run an "optimize table" command for cache tables
                '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