Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

1 files changed, 16 insertions, 0 deletions

diff --git a/config.php.sample b/config.php.sample
index 0a01552fe..fa3528835 100644
--- a/config.php.sample
+++ b/config.php.sample
@@ -128,6 +128,14 @@ $config['sphinx']['port'] = 3312;
 #background. See the README for details.
 #$config['queue']['enabled'] = true;
 
+#Queue subsystem
+#subsystems: internal (default) or stomp
+#using stomp requires an external message queue server
+#$config['queue']['subsystem'] = 'stomp';
+#$config['queue']['stomp_server'] = 'tcp://localhost:61613';
+#use different queue_basename for each laconica instance managed by the server
+#$config['queue']['queue_basename'] = 'laconica';
+
 #The following customise the behaviour of the various daemons:
 #$config['daemon']['piddir'] = '/var/run';
 #$config['daemon']['user'] = false;
@@ -188,3 +196,11 @@ $config['sphinx']['port'] = 3312;
 
 #Use a different hostname for SSL-encrypted pages
 #$config['site']['sslserver'] = 'secure.example.org';
+
+#If you have a lot of status networks on the same server, you can
+#store the site data in a database and switch as follows
+#Status_network::setupDB('localhost', 'statusnet', 'statuspass', 'statusnet');
+#if (!Status_network::setupSite($_server, $_path)) {
+#        print "Error\n";
+#        exit(1);
+#}