From f0256b08ffe566885521d48ba275708a46e2703b Mon Sep 17 00:00:00 2001
From: sparrow <sparrow@spooky.academy>
Date: Wed, 28 Jun 2023 03:09:22 +0100
Subject: [PATCH] expose redis tls settings directly to config

---
 .config/example.yml                      | 4 +++-
 packages/backend/src/config/types.ts     | 2 +-
 packages/backend/src/db/postgre.ts       | 5 +----
 packages/backend/src/db/redis.ts         | 5 +----
 packages/backend/src/queue/initialize.ts | 4 +---
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.config/example.yml b/.config/example.yml
index b96dc643ba..51d380e7e7 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -58,7 +58,9 @@ db:
 redis:
   host: localhost
   port: 6379
-  #tls: false
+  #tls:
+  #  host: localhost
+  #  rejectUnauthorized: false
   #family: 0  # 0=Both, 4=IPv4, 6=IPv6
   #pass: example-pass
   #prefix: example-prefix
diff --git a/packages/backend/src/config/types.ts b/packages/backend/src/config/types.ts
index 028403374f..cbe27543b3 100644
--- a/packages/backend/src/config/types.ts
+++ b/packages/backend/src/config/types.ts
@@ -24,7 +24,7 @@ export type Source = {
 		db?: number;
 		prefix?: string;
 		user?: string;
-		tls?: boolean;
+		tls?: { [x: string]: string };
 	};
 	elasticsearch: {
 		host: string;
diff --git a/packages/backend/src/db/postgre.ts b/packages/backend/src/db/postgre.ts
index a3f065e198..f632a6ec4a 100644
--- a/packages/backend/src/db/postgre.ts
+++ b/packages/backend/src/db/postgre.ts
@@ -211,10 +211,7 @@ export const db = new DataSource({
 					password: config.redis.pass,
 					keyPrefix: `${config.redis.prefix}:query:`,
 					db: config.redis.db || 0,
-					tls: config.redis.tls ? {
-						host: config.redis.host,
-						rejectUnauthorized: false, // TODO make configurable
-					} : {},
+					tls: config.redis.tls || {} ,
 				},
 		  }
 		: false,
diff --git a/packages/backend/src/db/redis.ts b/packages/backend/src/db/redis.ts
index 0d353d3ce1..24563661e9 100644
--- a/packages/backend/src/db/redis.ts
+++ b/packages/backend/src/db/redis.ts
@@ -10,10 +10,7 @@ export function createConnection() {
 		username: config.redis.user ?? "default",
 		keyPrefix: `${config.redis.prefix}:`,
 		db: config.redis.db || 0,
-		tls: config.redis.tls ? {
-			rejectUnauthorized: false, //TODO make configurable
-			host: config.redis.host,
-		} : {},
+		tls: config.redis.tls || {},
 	});
 }
 
diff --git a/packages/backend/src/queue/initialize.ts b/packages/backend/src/queue/initialize.ts
index d5cf2b9087..8d728df5be 100644
--- a/packages/backend/src/queue/initialize.ts
+++ b/packages/backend/src/queue/initialize.ts
@@ -10,9 +10,7 @@ export function initialize<T>(name: string, limitPerSec = -1) {
 			user: config.redis.user ?? "default",
 			password: config.redis.pass,
 			db: config.redis.db || 0,
-			tls: config.redis.tls ? {
-				host: config.redis.host, //TODO add configurable cert validation
-			} : {},
+			tls: config.redis.tls || {},
 		},
 		prefix: config.redis.prefix ? `${config.redis.prefix}:queue` : "queue",
 		limiter: