aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2024-11-17 10:41:49 +01:00
Code Activity

Adding REDIS_DB_INDEX configuration to session locking aswell.

Browse source 
Changing naming convetion to match others

Signed-off-by: Jan Zalar <jan.zalar6@gmail.com>
This commit is contained in:
Jan Zalar 2024-09-05 09:20:33 +02:00
parent 374495c565
commit 9360474bc1
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
29/apache/Dockerfile
View file

@ -21,6 +21,7 @@ RUN set -ex; \
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
ENV PHP_MEMORY_LIMIT 512M
ENV PHP_UPLOAD_LIMIT 512M
ENV REDIS_DB_INDEX=0
RUN set -ex; \
\
savedAptMark="$(apt-mark showmanual)"; \

4
29/apache/config/redis.config.php
View file

@ -14,8 +14,8 @@ if (getenv('REDIS_HOST')) {
} elseif (getenv('REDIS_HOST')[0] != '/') {
$CONFIG['redis']['port'] = 6379;
}
if (getenv('REDIS_DBINDEX') !== false) {
$CONFIG['redis']['dbindex'] = (int) getenv('REDIS_DBINDEX');
if (getenv('REDIS_DB_INDEX') !== false) {
$CONFIG['redis']['dbindex'] = (int) getenv('REDIS_DB_INDEX');
}
}

2
README.md
View file

@ -160,7 +160,7 @@ If you want to use Redis you have to create a separate [Redis](https://hub.docke
- `REDIS_HOST` (not set by default) Name of Redis container
- `REDIS_HOST_PORT` (default: `6379`) Optional port for Redis, only use for external Redis servers that run on non-standard ports.
- `REDIS_HOST_PASSWORD` (not set by default) Redis password
- `REDIS_DBINDEX`(not set by default) Value for dbindex config value
- `REDIS_DB_INDEX` (default: `0`) Value for dbindex config value
The use of Redis is recommended to prevent file locking problems. See the examples for further instructions.

8
docker-entrypoint.sh
View file

@ -114,15 +114,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
# check if redis host is an unix socket path
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
echo "session.save_path = \"unix://${REDIS_HOST}/${REDIS_DB_INDEX}?auth=${REDIS_HOST_PASSWORD}\""
else
echo "session.save_path = \"unix://${REDIS_HOST}\""
echo "session.save_path = \"unix://${REDIS_HOST}/${REDIS_DB_INDEX}\""
fi
# check if redis password has been set
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}/${REDIS_DB_INDEX}?auth=${REDIS_HOST_PASSWORD}\""
else
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}/${REDIS_DB_INDEX}\""
fi
echo "redis.session.locking_enabled = 1"
echo "redis.session.lock_retries = -1"