GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.8.x' into 0.9.x

Browse Source 
Conflicts:
	EVENTS.txt
	actions/finishremotesubscribe.php
	actions/postnotice.php
	actions/public.php
	actions/remotesubscribe.php
	actions/showstream.php
	actions/updateprofile.php
	actions/userauthorization.php
	classes/laconica.ini
	lib/common.php
	lib/oauthstore.php
	lib/omb.php
This commit is contained in:
Evan Prodromou
2009-08-27 11:16:45 -07:00
parent f1fda6c050 82b0927f58
commit 5d09b6b3f0
432 changed files with 3590 additions and 3509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
config.php.sample
View File

@@ -1,7 +1,7 @@
<?php
/* -*- mode: php -*- */
if (!defined('LACONICA')) { exit(1); }
if (!defined('STATUSNET')) { exit(1); }
// If you have downloaded libraries in random little places, you
// can add the paths here
@@ -13,9 +13,9 @@ if (!defined('LACONICA')) { exit(1); }
// options
// These are for configuring your URLs
$config['site']['name'] = 'Just another Laconica microblog';
$config['site']['name'] = 'Just another StatusNet microblog';
$config['site']['server'] = 'localhost';
$config['site']['path'] = 'laconica';
$config['site']['path'] = 'statusnet';
// $config['site']['fancy'] = false;
// $config['site']['theme'] = 'default';
// Sets the site's default design values
@@ -42,9 +42,9 @@ $config['site']['path'] = 'laconica';
// $config['site']['private'] = true;
// If you want logging sent to a file instead of syslog
// $config['site']['logfile'] = '/tmp/laconica.log';
// $config['site']['logfile'] = '/tmp/statusnet.log';
// Change the syslog facility that Laconica logs to (default is LOG_USER)
// Change the syslog facility that StatusNet logs to (default is LOG_USER)
// $config['syslog']['facility'] = LOG_LOCAL7;
// Enables extra log information, for example full details of PEAR DB errors
@@ -56,8 +56,8 @@ $config['site']['path'] = 'laconica';
// This is a PEAR DB DSN, see http://pear.php.net/manual/en/package.database.db.intro-dsn.php
// Set it to match your actual database
$config['db']['database'] = 'mysql://laconica:microblog@localhost/laconica';
// $config['db']['ini_your_db_name'] = $config['db']['schema_location'].'/laconica.ini';
$config['db']['database'] = 'mysql://statusnet:microblog@localhost/statusnet';
// $config['db']['ini_your_db_name'] = $config['db']['schema_location'].'/statusnet.ini';
// *** WARNING *** WARNING *** WARNING *** WARNING ***
// Setting debug to a non-zero value will expose your DATABASE PASSWORD to Web users.
// !!!!!! DO NOT SET THIS ON PRODUCTION SERVERS !!!!!! DB_DataObject's bug, btw, not
@@ -149,15 +149,15 @@ $config['sphinx']['port'] = 3312;
// 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';
// use different queue_basename for each statusnet instance managed by the server
// $config['queue']['queue_basename'] = 'statusnet';
// The following customise the behaviour of the various daemons:
// $config['daemon']['piddir'] = '/var/run';
// $config['daemon']['user'] = false;
// $config['daemon']['group'] = false;
// For installations with high traffic, laconica can use MemCached to cache
// For installations with high traffic, statusnet can use MemCached to cache
// frequently requested information. Only enable the following if you have
// MemCached up and running:
// $config['memcached']['enabled'] = false;
@@ -173,8 +173,8 @@ $config['sphinx']['port'] = 3312;
// Disable Twitter integration
// $config['twitter']['enabled'] = false;
// Twitter integration source attribute. Note: default is Laconica
// $config['integration']['source'] = 'Laconica';
// Twitter integration source attribute. Note: default is StatusNet
// $config['integration']['source'] = 'StatusNet';
// Enable bidirectional Twitter bridge
//