mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14635 from owncloud/cleanup-config.sample.php 

Cleanup config.sample.php
This commit is contained in:
Lukas Reschke 2015-03-02 14:35:54 +01:00
parent 9c79b1fc6d 8cf61c09c8
commit e1f833a611
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
config/config.sample.php
View File

@ -50,13 +50,13 @@ $CONFIG = array(
/** /**
* The salt used to hash all passwords, auto-generated by the ownCloud * The salt used to hash all passwords, auto-generated by the ownCloud
* installer. (There are also per-user salts.) If you lose this salt you lose * installer. (There are also per-user salts.) If you lose this salt you lose
* all your passwords. This example is for documentation only, * all your passwords. This example is for documentation only, and you should
* and you should never use it. * never use it.
* *
* @deprecated This salt is deprecated and only used for legacy-compatibility, developers * @deprecated This salt is deprecated and only used for legacy-compatibility,
* should *NOT* use this value for anything nowadays. * developers should *NOT* use this value for anything nowadays.
* *
*'passwordsalt' => 'd3c944a9af095aa08f', * 'passwordsalt' => 'd3c944a9af095aa08f',
*/ */
'passwordsalt' => '', 'passwordsalt' => '',
@ -80,8 +80,8 @@ $CONFIG = array(
/** /**
* Where user files are stored; this defaults to ``data/`` in the ownCloud * Where user files are stored; this defaults to ``data/`` in the ownCloud
* directory. The SQLite database is also stored here, when you use SQLite. (SQLite is * directory. The SQLite database is also stored here, when you use SQLite.
* available only in ownCloud Community Edition) * (SQLite is available only in ownCloud Community Edition)
*/ */
'datadirectory' => '/var/www/owncloud/data', 'datadirectory' => '/var/www/owncloud/data',
@ -145,8 +145,8 @@ $CONFIG = array(
), ),
/** /**
* sqlite3 journal mode can be specified using this config parameter - can be 'WAL' or 'DELETE' * sqlite3 journal mode can be specified using this config parameter - can be
* see for more details https://www.sqlite.org/wal.html * 'WAL' or 'DELETE' see for more details https://www.sqlite.org/wal.html
*/ */
'sqlite.journal_mode' => 'DELETE', 'sqlite.journal_mode' => 'DELETE',
@ -512,8 +512,9 @@ $CONFIG = array(
* Default is within the tmp directory. The file is named in the following way * Default is within the tmp directory. The file is named in the following way
* owncloud-server-$INSTANCEID-cron.lock * owncloud-server-$INSTANCEID-cron.lock
* where $INSTANCEID is the string specified in the instanceid field. * where $INSTANCEID is the string specified in the instanceid field.
* Because the cron lock file is accessed in regular intervals, it may prevent enabled disk drives from spinning down. * Because the cron lock file is accessed in regular intervals, it may prevent
* A different location for this file can solve such issues. * enabled disk drives from spinning down. A different location for this file
* can solve such issues.
*/ */
'cron.lockfile.location' => '', 'cron.lockfile.location' => '',
@ -681,8 +682,8 @@ $CONFIG = array(
* - OC\Preview\TIFF * - OC\Preview\TIFF
* *
* .. note:: Troubleshooting steps for the MS Word previews are available * .. note:: Troubleshooting steps for the MS Word previews are available
* at the :doc:`collaborative_documents_configuration` section * at the :doc:`../configuration_files/collaborative_documents_configuration`
* of the Administrators Manual. * section of the Administrators Manual.
* *
* The following providers are not available in Microsoft Windows: * The following providers are not available in Microsoft Windows:
* *
@ -812,8 +813,8 @@ $CONFIG = array(
/** /**
* Server details for one or more memcached servers to use for memory caching. * Server details for one or more memcached servers to use for memory caching.
* Memcache is only used if other memory cache options (xcache, apc, apcu, redis) are * Memcache is only used if other memory cache options (xcache, apc, apcu,
* not available. * redis) are not available.
*/ */
'memcached_servers' => array( 'memcached_servers' => array(
// hostname, port and optional weight. Also see: // hostname, port and optional weight. Also see: