From a85411390116a9394a42233c083db5c83c8fd4ec Mon Sep 17 00:00:00 2001
From: Don Benjamin <don@webhammer.co.uk>
Date: Mon, 8 Apr 2024 13:19:49 +0100
Subject: [PATCH] Issue 331 - Fix failing redis persistence (#369)

* #331 Redis was not reading the config file

* #113 Don't create recursive symlink in the storage directory
---
 docker/php-fpm-wrapper.sh | 2 +-
 docker/redis-wrapper.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/php-fpm-wrapper.sh b/docker/php-fpm-wrapper.sh
index 4387f147..846e00b8 100644
--- a/docker/php-fpm-wrapper.sh
+++ b/docker/php-fpm-wrapper.sh
@@ -17,7 +17,7 @@ touch /var/log/opnform.log
 chown opnform /var/log/opnform.log
 
 echo "Linking persistent storage into app"
-ln -sf /persist/storage /app/storage
+ln -t /app -sf /persist/storage
 
 . /app/.env
 
diff --git a/docker/redis-wrapper.sh b/docker/redis-wrapper.sh
index 49cccff3..afa14b10 100644
--- a/docker/redis-wrapper.sh
+++ b/docker/redis-wrapper.sh
@@ -4,4 +4,4 @@ sysctl vm.overcommit_memory=1
 mkdir -p /persist/redis/data
 chown redis -R /persist/redis/data
 
-sudo -u redis /usr/bin/redis-server
+sudo -u redis /usr/bin/redis-server /etc/redis/redis.conf