Merge remote-tracking branch 'origin/1.0.x' into 1.0.x

[quix0rs-gnu-social.git] / config.php.sample

diff --git a/config.php.sample b/config.php.sample
index 5481ca539e591a10bb1ad0c6d94991bd9aeacb59..87a1977b5f589318d5ad409a6b6f30550ee7ad80 100644 (file)
--- a/config.php.sample
+++ b/config.php.sample
@@ -41,6 +41,12 @@ $config['site']['path'] = 'statusnet';
 // Make the site invisible to  non-logged-in users
 // $config['site']['private'] = true;
 
+// Allow Cross-Origin Resource Sharing (CORS) for service discovery
+// (host-meta, XRD, etc.) Useful for AJAXy client applications. Should
+// probably NOT be on for private / intranet sites but OK for public sites.
+// Default is off.
+// $config['discovery']['cors'] = true;
+
 // If your web server supports X-Sendfile (Apache with mod_xsendfile,
 // lighttpd, nginx), you can enable X-Sendfile support for better
 // performance. Presently, only attachment serving when the site is
@@ -182,6 +188,29 @@ $config['sphinx']['port'] = 3312;
 // $config['memcached']['server'] = 'localhost';
 // $config['memcached']['port'] = 11211;
 
+// People tags
+// Maximum number of tags a user can create:
+// $config['peopletag']['maxtags'] = 100;
+// Maximum number of people can have the same tag by the same user
+// $config['peopletag']['maxpeople'] = 500;
+// Types of users one can tag.
+// Everyone.
+// $config['peopletag']['allow_tagging']['all'] = true;
+// Local only.
+// $config['peopletag']['allow_tagging']['local'] = true;
+// Subscriptions / Subscribers only (including remote)
+// $config['peopletag']['allow_tagging']['subs'] = true;
+// Remote.
+// $config['peopletag']['allow_tagging']['remote'] = true;
+// Examples:
+// The following set of options allows tagging local users and
+// remote subscribers / subscription.
+// $config['peopletag']['allow_tagging']['all'] = false;
+// $config['peopletag']['allow_tagging']['local'] = true;
+// $config['peopletag']['allow_tagging']['subs'] = true;
+// Or:
+// $config['peopletag']['allow_tagging'] = array('local' => true, 'subs' =>true);
+
 // Disable post-by-email
 // $config['emailpost']['enabled'] = false;