Merge branch 'testing'

[quix0rs-gnu-social.git] / lib / default.php

diff --git a/lib/default.php b/lib/default.php
index c729193b52b366bfa6bf2e891a842d49fc3a6665..1337a96336e6bcc6c71620f2c6abae1b06898b2f 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -84,6 +84,8 @@ $default =
               'control_channel' => '/topic/statusnet-control', // broadcasts to all queue daemons
               'stomp_username' => null,
               'stomp_password' => null,
+              'stomp_persistent' => true, // keep items across queue server restart, if persistence is enabled
+              'stomp_manual_failover' => true, // if multiple servers are listed, treat them as separate (enqueue on one randomly, listen on all)
               'monitor' => null, // URL to monitor ping endpoint (work in progress)
               'softlimit' => '90%', // total size or % of memory_limit at which to restart queue threads gracefully
               'debug_memory' => false, // true to spit memory usage to log
@@ -264,7 +266,7 @@ $default =
                                  'OpenID' => null),
               ),
         'admin' =>
-        array('panels' => array('design', 'site', 'user', 'paths', 'access')),
+        array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions')),
         'singleuser' =>
         array('enabled' => false,
               'nickname' => null),