summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/config.sample.php33
1 files changed, 18 insertions, 15 deletions
diff --git a/config/config.sample.php b/config/config.sample.php
index fb7d41bd9da..b143693082a 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -249,7 +249,7 @@ $CONFIG = array(
),
/**
- * If your user backend does not allow to reset the password (e.g. when it's a
+ * If your user backend does not allow password resets (e.g. when it's a
* read-only user backend like LDAP), you can specify a custom link, where the
* user is redirected to, when clicking the "reset password" link after a failed
* login-attempt.
@@ -436,12 +436,12 @@ $CONFIG = array(
* the correct value would most likely be "/nextcloud". If Nextcloud is running
* under "https://mycloud.org/" then it would be "/".
*
- * Note that above rule is not valid in every case, there are some rare setup
+ * Note that the above rule is not valid in every case, as there are some rare setup
* cases where this may not apply. However, to avoid any update problems this
* configuration value is explicitly opt-in.
*
- * After setting this value run `occ maintenance:update:htaccess` and when following
- * conditions are met Nextcloud uses URLs without index.php in it:
+ * After setting this value run `occ maintenance:update:htaccess`. Now, when the
+ * following conditions are met Nextcloud URLs won't contain `index.php`:
*
* - `mod_rewrite` is installed
* - `mod_env` is installed
@@ -960,7 +960,7 @@ $CONFIG = array(
/**
* Replaces the default System Tags Manager Factory. This can be utilized if an
* own or 3rdParty SystemTagsManager should be used that – for instance – uses the
- * filesystem instead of the database to keep the comments.
+ * filesystem instead of the database to keep the tags.
*
* Defaults to ``\OC\SystemTag\ManagerFactory``
*/
@@ -1000,11 +1000,6 @@ $CONFIG = array(
),
/**
- * Allow the configuration of system wide trusted certificates
- */
-'enable_certificate_management' => false,
-
-/**
* Memory caching backend configuration
*
* Available cache backends:
@@ -1068,8 +1063,16 @@ $CONFIG = array(
*
* Available failover modes:
* - \RedisCluster::FAILOVER_NONE - only send commands to master nodes (default)
- * - \RedisCluster::FAILOVER_ERROR - failover to slaves for read commands if master is unavailable
+ * - \RedisCluster::FAILOVER_ERROR - failover to slaves for read commands if master is unavailable (recommended)
* - \RedisCluster::FAILOVER_DISTRIBUTE - randomly distribute read commands across master and slaves
+ *
+ * WARNING: FAILOVER_DISTRIBUTE is a not recommended setting and we strongly
+ * suggest to not use it if you use Redis for file locking. Due to the way Redis
+ * is synchronised it could happen, that the read for an existing lock is
+ * scheduled to a slave that is not fully synchronised with the connected master
+ * which then causes a FileLocked exception.
+ *
+ * See https://redis.io/topics/cluster-spec for details about the Redis cluster
*/
'redis.cluster' => [
'seeds' => [ // provide some/all of the cluster servers to bootstrap discovery, port required
@@ -1078,7 +1081,7 @@ $CONFIG = array(
],
'timeout' => 0.0,
'read_timeout' => 0.0,
- 'failover_mode' => \RedisCluster::FAILOVER_DISTRIBUTE
+ 'failover_mode' => \RedisCluster::FAILOVER_ERROR
],
@@ -1162,7 +1165,7 @@ $CONFIG = array(
'objectstore' => [
'class' => 'OC\\Files\\ObjectStore\\Swift',
'arguments' => [
- // trystack will user your facebook id as the user name
+ // trystack will use your facebook id as the user name
'username' => 'facebook100000123456789',
// in the trystack dashboard go to user -> settings -> API Password to
// generate a password
@@ -1196,7 +1199,7 @@ $CONFIG = array(
/**
* Replaces the default Share Provider Factory. This can be utilized if
- * own or 3rdParty Share Providers be used that – for instance – uses the
+ * own or 3rdParty Share Providers are used that – for instance – use the
* filesystem instead of the database to keep the share information.
*
* Defaults to ``\OC\Share20\ProviderFactory``
@@ -1453,7 +1456,7 @@ $CONFIG = array(
'filelocking.enabled' => true,
/**
- * Set the time-to-live for locks in secconds.
+ * Set the lock's time-to-live in seconds.
*
* Any lock older than this will be automatically cleaned up.
*