From d35fa242e299bddf8de3aebee7efa83493a82f81 Mon Sep 17 00:00:00 2001
From: Matthew Lopez <73856503+MatthewL246@users.noreply.github.com>
Date: Sun, 28 Apr 2024 13:27:04 -0400
Subject: [PATCH] Configure Juxtaposition with Redis

---
 compose.yml                                         |  1 +
 config/juxtaposition-config.js                      |  4 ++++
 environment/juxtaposition-ui.env                    |  2 ++
 .../redis-create-client-with-url.patch              | 13 +++++++++++++
 4 files changed, 20 insertions(+)
 create mode 100644 patches/juxtaposition-ui/redis-create-client-with-url.patch

diff --git a/compose.yml b/compose.yml
index 5b7f07c..a6b3456 100644
--- a/compose.yml
+++ b/compose.yml
@@ -296,6 +296,7 @@ services:
     depends_on:
       - account
       - mongodb
+      - redis
       - friends
     restart: unless-stopped
     ports:
diff --git a/config/juxtaposition-config.js b/config/juxtaposition-config.js
index b7e8f1c..5b83b6a 100644
--- a/config/juxtaposition-config.js
+++ b/config/juxtaposition-config.js
@@ -46,5 +46,9 @@ module.exports = JSON.parse(
                 secret: process.env.JUXT_CONFIG_AWS_SPACES_SECRET,
             },
         },
+        redis: {
+            host: process.env.JUXT_CONFIG_REDIS_HOST,
+            port: process.env.JUXT_CONFIG_REDIS_PORT,
+        },
     })
 );
diff --git a/environment/juxtaposition-ui.env b/environment/juxtaposition-ui.env
index 2803b96..b8b2eb3 100644
--- a/environment/juxtaposition-ui.env
+++ b/environment/juxtaposition-ui.env
@@ -11,3 +11,5 @@ JUXT_CONFIG_WHITELIST=1|http,mii.olv.pretendo.cc,,2|1|https,mii.olv.pretendo.cc,
 JUXT_CONFIG_POST_LIMIT=20
 JUXT_CONFIG_AWS_SPACES_ENDPOINT=http://minio.pretendo.cc
 JUXT_CONFIG_AWS_SPACES_KEY=minio_pretendo
+JUXT_CONFIG_REDIS_HOST=redis
+JUXT_CONFIG_REDIS_PORT=6379
diff --git a/patches/juxtaposition-ui/redis-create-client-with-url.patch b/patches/juxtaposition-ui/redis-create-client-with-url.patch
new file mode 100644
index 0000000..3e3dd39
--- /dev/null
+++ b/patches/juxtaposition-ui/redis-create-client-with-url.patch
@@ -0,0 +1,13 @@
+diff --git i/src/redisCache.js w/src/redisCache.js
+index b4f3b7a..cabe595 100644
+--- i/src/redisCache.js
++++ w/src/redisCache.js
+@@ -5,7 +5,7 @@ const logger = require('./logger');
+ const config = require('../config.json');
+ const { host, port } = config.redis;
+ 
+-const redisClient = redis.createClient({ host, port });
++const redisClient = redis.createClient({ url: `redis://${host}:${port}` });
+ 
+ redisClient.on('error', (error) => {
+ 	logger.error(error);