Support PostgreSQL Extra Connection options (#4970)

misskey-dev · May 23, 2019 · 6de08d0 · 6de08d0
1 parent f54cd10
commit 6de08d0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/.config/example.yml b/.config/example.yml
@@ -62,6 +62,10 @@ db:
   user: example-misskey-user
   pass: example-misskey-pass
 
+  # Extra Connection options
+  #extra:
+  #  ssl: true
+
 #   ┌─────────────────────┐
 #───┘ Redis configuration └─────────────────────────────────────
 

diff --git a/src/config/types.ts b/src/config/types.ts
@@ -14,6 +14,7 @@ export type Source = {
 		db: string;
 		user: string;
 		pass: string;
+		extra?: { [x: string]: string };
 	};
 	redis: {
 		host: string;

diff --git a/src/db/postgre.ts b/src/db/postgre.ts
@@ -93,6 +93,7 @@ export function initDb(justBorrow = false, sync = false, log = false) {
 		username: config.db.user,
 		password: config.db.pass,
 		database: config.db.db,
+		extra: config.db.extra,
 		synchronize: process.env.NODE_ENV === 'test' || sync,
 		dropSchema: process.env.NODE_ENV === 'test' && !justBorrow,
 		logging: log,

diff --git a/src/ormconfig.ts b/src/ormconfig.ts
@@ -8,6 +8,7 @@ const json = {
 	username: config.db.user,
 	password: config.db.pass,
 	database: config.db.db,
+	extra: config.db.extra,
 	entities: ['src/models/entities/*.ts'],
 	migrations: ['migration/*.ts'],
 	cli: {