summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@owncloud.com>2013-12-09 14:35:00 +0100
committerAndreas Fischer <bantu@owncloud.com>2013-12-09 14:35:00 +0100
commit3084a52a970c83ca35135f490b9bcb06b9900867 (patch)
tree0d2d508f620373d31489915bb067304440913933
parent6aab1ebf446790ee31a306d55ce2747a56a66f1c (diff)
parent5db73c05fb692737cc466f033fa2c79c60f100ed (diff)
downloadnextcloud-server-3084a52a970c83ca35135f490b9bcb06b9900867.tar.gz
nextcloud-server-3084a52a970c83ca35135f490b9bcb06b9900867.zip
Merge pull request #6246 from owncloud/memcached-config-sample
Document memcached settings in config.sample.php * owncloud/memcached-config-sample: Document memcached settings in config.sample.php
-rwxr-xr-xconfig/config.sample.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/config/config.sample.php b/config/config.sample.php
index ba068968323..1070ef72eda 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -114,6 +114,9 @@ $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),
+
/* How long should ownCloud keep deleted files in the trash bin, default value: 30 days */
'trashbin_retention_obligation' => 30,