From 0b31db1b2189ee57269c03e0970763fd645bfa89 Mon Sep 17 00:00:00 2001 From: Simon L Date: Thu, 28 Mar 2024 12:10:58 +0100 Subject: [PATCH] nextcloud container - add redis session handler to Dockerfile Signed-off-by: Simon L --- Containers/nextcloud/Dockerfile | 8 ++++++++ Containers/nextcloud/entrypoint.sh | 11 ----------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Containers/nextcloud/Dockerfile b/Containers/nextcloud/Dockerfile index b9594aee..1b83bcdc 100644 --- a/Containers/nextcloud/Dockerfile +++ b/Containers/nextcloud/Dockerfile @@ -117,6 +117,14 @@ RUN set -ex; \ echo 'max_input_time=${PHP_MAX_TIME}'; \ } > /usr/local/etc/php/conf.d/nextcloud.ini; \ \ + { \ + echo 'session.save_handler = redis'; \ + echo 'session.save_path = "tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}"'; \ + echo 'redis.session.locking_enabled = 1'; \ + echo 'redis.session.lock_retries = -1'; \ + echo 'redis.session.lock_wait_time = 10000'; \ + } > /usr/local/etc/php/conf.d/redis-session.ini; \ + \ mkdir -p /var/www/data; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www; \ diff --git a/Containers/nextcloud/entrypoint.sh b/Containers/nextcloud/entrypoint.sh index 4b24d748..ca22682d 100644 --- a/Containers/nextcloud/entrypoint.sh +++ b/Containers/nextcloud/entrypoint.sh @@ -19,17 +19,6 @@ run_upgrade_if_needed_due_to_app_update() { fi } -echo "Configuring Redis as session handler..." -cat << REDIS_CONF > /usr/local/etc/php/conf.d/redis-session.ini -session.save_handler = redis -session.save_path = "tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}" -redis.session.locking_enabled = 1 -redis.session.lock_retries = -1 -# redis.session.lock_wait_time is specified in microseconds. -# Wait 10ms before retrying the lock rather than the default 2ms. -redis.session.lock_wait_time = 10000 -REDIS_CONF - # Check permissions in ncdata touch "$NEXTCLOUD_DATA_DIR/this-is-a-test-file" &>/dev/null if ! [ -f "$NEXTCLOUD_DATA_DIR/this-is-a-test-file" ]; then