Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

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

diff --git a/lib/default.php b/lib/default.php
index f6cc4b725af22cb2d136b6f017869901cda4e0cd..82b6910abde14b94a06e10e7622eb8fd6a71d065 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -125,10 +125,6 @@ $default =
               'public' => array()), # JIDs of users who want to receive the public stream
         'invite' =>
         array('enabled' => true),
-        'sphinx' =>
-        array('enabled' => false,
-              'server' => 'localhost',
-              'port' => 3312),
         'tag' =>
         array('dropoff' => 864000.0),
         'popular' =>
@@ -163,7 +159,7 @@ $default =
         array('default' => null,
               'welcome' => null),
         'snapshot' =>
-        array('run' => 'web',
+        array('run' => 'never',
               'frequency' => 10000,
               'reporturl' => 'http://status.net/stats/report'),
         'attachments' =>