summaryrefslogtreecommitdiffstats
path: root/config/config.sample.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2014-02-10 14:03:06 +0100
committerRobin Appelman <icewind@owncloud.com>2014-02-10 14:03:06 +0100
commite6df86f4cb4b28c07804cb5748cf3d0679e58b25 (patch)
treec48fbfa525e6f914a38753c34ab9eeac55782c69 /config/config.sample.php
parent8ad3fc89bed6b52b0f40095834b3b61b36d7c71c (diff)
parent02bdb470498fb8b71f1bc582af2f55795a719c39 (diff)
downloadnextcloud-server-e6df86f4cb4b28c07804cb5748cf3d0679e58b25.tar.gz
nextcloud-server-e6df86f4cb4b28c07804cb5748cf3d0679e58b25.zip
Merge branch 'master' into quota-space-root
Diffstat (limited to 'config/config.sample.php')
-rwxr-xr-xconfig/config.sample.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/config/config.sample.php b/config/config.sample.php
index ef5fb7ea5a5..0cd321d095d 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -120,8 +120,14 @@ $CONFIG = array(
/* Password to use for sendmail mail, depends on mail_smtpauth if this is used */
"mail_smtppassword" => "",
-/* memcached hostname and port (Only used when xCache, APC and APCu are absent.) */
-"memcached_server" => array('localhost', 11211),
+/* memcached servers (Only used when xCache, APC and APCu are absent.) */
+"memcached_servers" => array(
+ // hostname, port and optional weight. Also see:
+ // http://www.php.net/manual/en/memcached.addservers.php
+ // http://www.php.net/manual/en/memcached.addserver.php
+ array('localhost', 11211),
+ //array('other.host.local', 11211),
+),
/* How long should ownCloud keep deleted files in the trash bin, default value: 30 days */
'trashbin_retention_obligation' => 30,