fix(backend): Use SSL option for Meilisearch (#10772)

misskey-dev · May 5, 2023 · ae21b75 · ae21b75
1 parent 4a72941
commit ae21b75
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 1 deletion.
diff --git a/.config/docker_example.yml b/.config/docker_example.yml
@@ -102,6 +102,7 @@ redis:
 #  host: meilisearch
 #  port: 7700
 #  apiKey: ''
+#  ssl: true
 
 #   ┌───────────────┐
 #───┘ ID generation └───────────────────────────────────────────

diff --git a/.config/example.yml b/.config/example.yml
@@ -102,6 +102,7 @@ redis:
 #  host: localhost
 #  port: 7700
 #  apiKey: ''
+#  ssl: true
 
 #   ┌───────────────┐
 #───┘ ID generation └───────────────────────────────────────────

diff --git a/.devcontainer/devcontainer.yml b/.devcontainer/devcontainer.yml
@@ -102,6 +102,7 @@ redis:
 #  host: meilisearch
 #  port: 7700
 #  apiKey: ''
+#  ssl: true
 
 #   ┌───────────────┐
 #───┘ ID generation └───────────────────────────────────────────

diff --git a/chart/files/default.yml b/chart/files/default.yml
@@ -123,6 +123,7 @@ redis:
 #  host: localhost
 #  port: 7700
 #  apiKey: ''
+#  ssl: true
 
 #   ┌───────────────┐
 #───┘ ID generation └───────────────────────────────────────────

diff --git a/packages/backend/src/GlobalModule.ts b/packages/backend/src/GlobalModule.ts
@@ -28,7 +28,7 @@ const $meilisearch: Provider = {
 	useFactory: (config) => {
 		if (config.meilisearch) {
 			return new MeiliSearch({
-				host: `http://${config.meilisearch.host}:${config.meilisearch.port}`, 
+				host: `${config.meilisearch.ssl ? 'https' : 'http' }://${config.meilisearch.host}:${config.meilisearch.port}`,
 				apiKey: config.meilisearch.apiKey,
 			});
 		} else {

diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
@@ -61,6 +61,7 @@ export type Source = {
 		host: string;
 		port: string;
 		apiKey: string;
+		ssl?: boolean;
 	};
 
 	proxy?: string;