nextcloud
/
nextcloud-docker
mirror of https://github.com/nextcloud/docker
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge e6dd67322e into a06863774c

Browse Source
pull/2569/merge
orAAKLe 3 days ago committed by GitHub
parent a06863774c e6dd67322e
commit 93dfe79a48
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 165 additions and 7 deletions
Show Stats Download Patch File Download Diff File

24
.config/redis.config.php
Unescape View File

@ -1,5 +1,27 @@
<?php
if (getenv('REDIS_HOST')) {
if (getenv('REDIS_CLUSTER_SEEDS')) {
$redisClusterSeeds = array_values(
array_filter(
array_map('trim', explode(',', getenv('REDIS_CLUSTER_SEEDS'))),
function ($seed) {
return $seed !== '';
}
)
);
$CONFIG = array(
'memcache.distributed' => '\OC\Memcache\Redis',
'memcache.locking' => '\OC\Memcache\Redis',
'redis.cluster' => array(
'seeds' => $redisClusterSeeds,
'password' => getenv('REDIS_HOST_PASSWORD_FILE') ? trim(file_get_contents(getenv('REDIS_HOST_PASSWORD_FILE'))) : (string) getenv('REDIS_HOST_PASSWORD'),
),
);
if (getenv('REDIS_HOST_USER') !== false) {
$CONFIG['redis.cluster']['user'] = (string) getenv('REDIS_HOST_USER');
}
} elseif (getenv('REDIS_HOST')) {
$CONFIG = array(
'memcache.distributed' => '\OC\Memcache\Redis',
'memcache.locking' => '\OC\Memcache\Redis',

24
32/apache/config/redis.config.php
Unescape View File

@ -1,5 +1,27 @@
<?php
if (getenv('REDIS_HOST')) {
if (getenv('REDIS_CLUSTER_SEEDS')) {
$redisClusterSeeds = array_values(
array_filter(
array_map('trim', explode(',', getenv('REDIS_CLUSTER_SEEDS'))),
function ($seed) {
return $seed !== '';
}
)
);
$CONFIG = array(
'memcache.distributed' => '\OC\Memcache\Redis',
'memcache.locking' => '\OC\Memcache\Redis',
'redis.cluster' => array(
'seeds' => $redisClusterSeeds,
'password' => getenv('REDIS_HOST_PASSWORD_FILE') ? trim(file_get_contents(getenv('REDIS_HOST_PASSWORD_FILE'))) : (string) getenv('REDIS_HOST_PASSWORD'),
),
);
if (getenv('REDIS_HOST_USER') !== false) {
$CONFIG['redis.cluster']['user'] = (string) getenv('REDIS_HOST_USER');
}
} elseif (getenv('REDIS_HOST')) {
$CONFIG = array(
'memcache.distributed' => '\OC\Memcache\Redis',
'memcache.locking' => '\OC\Memcache\Redis',

24
32/fpm-alpine/config/redis.config.php
Unescape View File

@ -1,5 +1,27 @@
<?php
if (getenv('REDIS_HOST')) {
if (getenv('REDIS_CLUSTER_SEEDS')) {
$redisClusterSeeds = array_values(
array_filter(
array_map('trim', explode(',', getenv('REDIS_CLUSTER_SEEDS'))),
function ($seed) {
return $seed !== '';
}
)
);
$CONFIG = array(
'memcache.distributed' => '\OC\Memcache\Redis',
'memcache.locking' => '\OC\Memcache\Redis',
'redis.cluster' => array(
'seeds' => $redisClusterSeeds,
'password' => getenv('REDIS_HOST_PASSWORD_FILE') ? trim(file_get_contents(getenv('REDIS_HOST_PASSWORD_FILE'))) : (string) getenv('REDIS_HOST_PASSWORD'),
),
);
if (getenv('REDIS_HOST_USER') !== false) {
$CONFIG['redis.cluster']['user'] = (string) getenv('REDIS_HOST_USER');
}
} elseif (getenv('REDIS_HOST')) {
$CONFIG = array(
'memcache.distributed' => '\OC\Memcache\Redis',
'memcache.locking' => '\OC\Memcache\Redis',

24
32/fpm/config/redis.config.php
Unescape View File

@ -1,5 +1,27 @@
<?php
if (getenv('REDIS_HOST')) {
if (getenv('REDIS_CLUSTER_SEEDS')) {
$redisClusterSeeds = array_values(
array_filter(
array_map('trim', explode(',', getenv('REDIS_CLUSTER_SEEDS'))),
function ($seed) {
return $seed !== '';
}
)
);
$CONFIG = array(
'memcache.distributed' => '\OC\Memcache\Redis',
'memcache.locking' => '\OC\Memcache\Redis',
'redis.cluster' => array(
'seeds' => $redisClusterSeeds,
'password' => getenv('REDIS_HOST_PASSWORD_FILE') ? trim(file_get_contents(getenv('REDIS_HOST_PASSWORD_FILE'))) : (string) getenv('REDIS_HOST_PASSWORD'),
),
);
if (getenv('REDIS_HOST_USER') !== false) {
$CONFIG['redis.cluster']['user'] = (string) getenv('REDIS_HOST_USER');
}
} elseif (getenv('REDIS_HOST')) {
$CONFIG = array(
'memcache.distributed' => '\OC\Memcache\Redis',
'memcache.locking' => '\OC\Memcache\Redis',

24
33/apache/config/redis.config.php
Unescape View File

@ -1,5 +1,27 @@
<?php
if (getenv('REDIS_HOST')) {
if (getenv('REDIS_CLUSTER_SEEDS')) {
$redisClusterSeeds = array_values(
array_filter(
array_map('trim', explode(',', getenv('REDIS_CLUSTER_SEEDS'))),
function ($seed) {
return $seed !== '';
}
)
);
$CONFIG = array(
'memcache.distributed' => '\OC\Memcache\Redis',
'memcache.locking' => '\OC\Memcache\Redis',
'redis.cluster' => array(
'seeds' => $redisClusterSeeds,
'password' => getenv('REDIS_HOST_PASSWORD_FILE') ? trim(file_get_contents(getenv('REDIS_HOST_PASSWORD_FILE'))) : (string) getenv('REDIS_HOST_PASSWORD'),
),
);
if (getenv('REDIS_HOST_USER') !== false) {
$CONFIG['redis.cluster']['user'] = (string) getenv('REDIS_HOST_USER');
}
} elseif (getenv('REDIS_HOST')) {
$CONFIG = array(
'memcache.distributed' => '\OC\Memcache\Redis',
'memcache.locking' => '\OC\Memcache\Redis',

24
33/fpm-alpine/config/redis.config.php
Unescape View File

@ -1,5 +1,27 @@
<?php
if (getenv('REDIS_HOST')) {
if (getenv('REDIS_CLUSTER_SEEDS')) {
$redisClusterSeeds = array_values(
array_filter(
array_map('trim', explode(',', getenv('REDIS_CLUSTER_SEEDS'))),
function ($seed) {
return $seed !== '';
}
)
);
$CONFIG = array(
'memcache.distributed' => '\OC\Memcache\Redis',
'memcache.locking' => '\OC\Memcache\Redis',
'redis.cluster' => array(
'seeds' => $redisClusterSeeds,
'password' => getenv('REDIS_HOST_PASSWORD_FILE') ? trim(file_get_contents(getenv('REDIS_HOST_PASSWORD_FILE'))) : (string) getenv('REDIS_HOST_PASSWORD'),
),
);
if (getenv('REDIS_HOST_USER') !== false) {
$CONFIG['redis.cluster']['user'] = (string) getenv('REDIS_HOST_USER');
}
} elseif (getenv('REDIS_HOST')) {
$CONFIG = array(
'memcache.distributed' => '\OC\Memcache\Redis',
'memcache.locking' => '\OC\Memcache\Redis',

24
33/fpm/config/redis.config.php
Unescape View File

@ -1,5 +1,27 @@
<?php
if (getenv('REDIS_HOST')) {
if (getenv('REDIS_CLUSTER_SEEDS')) {
$redisClusterSeeds = array_values(
array_filter(
array_map('trim', explode(',', getenv('REDIS_CLUSTER_SEEDS'))),
function ($seed) {
return $seed !== '';
}
)
);
$CONFIG = array(
'memcache.distributed' => '\OC\Memcache\Redis',
'memcache.locking' => '\OC\Memcache\Redis',
'redis.cluster' => array(
'seeds' => $redisClusterSeeds,
'password' => getenv('REDIS_HOST_PASSWORD_FILE') ? trim(file_get_contents(getenv('REDIS_HOST_PASSWORD_FILE'))) : (string) getenv('REDIS_HOST_PASSWORD'),
),
);
if (getenv('REDIS_HOST_USER') !== false) {
$CONFIG['redis.cluster']['user'] = (string) getenv('REDIS_HOST_USER');
}
} elseif (getenv('REDIS_HOST')) {
$CONFIG = array(
'memcache.distributed' => '\OC\Memcache\Redis',
'memcache.locking' => '\OC\Memcache\Redis',

4
README.md
Unescape View File

@ -290,6 +290,10 @@ To use Redis for memory caching as well as PHP session storage, specify the foll
- `REDIS_HOST_USER` (not set by default) Optional username for Redis, only use for external Redis servers that require a user.
- `REDIS_HOST_PASSWORD` (not set by default) Redis password
For Redis Cluster, set the seed list as a comma-separated list of host:port pairs. When `REDIS_CLUSTER_SEEDS` is set, Redis Cluster config is used instead of `REDIS_HOST`.
- `REDIS_CLUSTER_SEEDS` (not set by default) Comma-separated list of cluster seeds, e.g. `redis-1:6379,redis-2:6379,redis-3:6379`
Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/caching_configuration.html) for more information.
### E-mail (SMTP) Configuration

Write Preview
Loading…
Cancel
Save