diff options
author | Bart Visscher <bartv@thisnet.nl> | 2014-01-30 18:16:55 +0100 |
---|---|---|
committer | Bart Visscher <bartv@thisnet.nl> | 2014-01-30 18:16:55 +0100 |
commit | b57299f72789fa3b8dd81778376c0f45d0af21a9 (patch) | |
tree | 766e5d2b62233b5f062c150bfe6c3050830abcf9 /config | |
parent | 21426b7ff6c8b84ea3898aa4a95a7fd3c4376ddb (diff) | |
parent | 271088a7a23ffcdb2082b6dfc5b6f50833612a0f (diff) | |
download | nextcloud-server-b57299f72789fa3b8dd81778376c0f45d0af21a9.tar.gz nextcloud-server-b57299f72789fa3b8dd81778376c0f45d0af21a9.zip |
Merge branch 'master' into db-convert-tool
Conflicts:
3rdparty
Diffstat (limited to 'config')
-rwxr-xr-x[-rw-r--r--] | config/config.sample.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index ba068968323..01abc583688 100644..100755 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -80,6 +80,12 @@ $CONFIG = array( /* Domain name used by ownCloud for the sender mail address, e.g. no-reply@example.com */ "mail_domain" => "example.com", +/* FROM address used by ownCloud for the sender mail address, e.g. owncloud@example.com + This setting overwrites the built in 'sharing-noreply' and 'lostpassword-noreply' + FROM addresses, that ownCloud uses +*/ +"mail_from_address" => "owncloud", + /* Enable SMTP class debugging */ "mail_smtpdebug" => false, @@ -114,6 +120,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, |