Merge branch 'dev' into proxy-syncing
This commit is contained in:
commit
206844e758
|
@ -12,6 +12,8 @@ export const ormConfigSchema = z.object({
|
|||
postgres: z.object({
|
||||
// connection URL for postgres database
|
||||
connection: z.string(),
|
||||
// whether to use SSL for the connection
|
||||
ssl: z.coerce.boolean().default(false),
|
||||
}),
|
||||
});
|
||||
|
||||
|
|
|
@ -48,6 +48,9 @@ export const configSchema = z.object({
|
|||
// Enable debug logging for MikroORM - Outputs queries and entity management logs
|
||||
// Do NOT use in production, leaks all sensitive data
|
||||
debugLogging: z.coerce.boolean().default(false),
|
||||
|
||||
// Enable SSL for the postgres connection
|
||||
ssl: z.coerce.boolean().default(false),
|
||||
}),
|
||||
crypto: z.object({
|
||||
// session secret. used for signing session tokens
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import { ormConf } from '@/config/orm';
|
||||
import { makeOrmConfig } from '@/modules/mikro/orm';
|
||||
|
||||
export default makeOrmConfig(ormConf.postgres.connection);
|
||||
export default makeOrmConfig(ormConf.postgres.connection, ormConf.postgres.ssl);
|
||||
|
|
|
@ -18,6 +18,7 @@ export async function setupMikroORM() {
|
|||
conf.postgres.connection,
|
||||
conf.postgres.debugLogging,
|
||||
(msg) => log.info(msg),
|
||||
conf.postgres.ssl,
|
||||
);
|
||||
|
||||
if (conf.postgres.syncSchema) {
|
||||
|
|
|
@ -2,7 +2,10 @@ import { Options } from '@mikro-orm/core';
|
|||
import { MikroORM, PostgreSqlDriver } from '@mikro-orm/postgresql';
|
||||
import path from 'path';
|
||||
|
||||
export function makeOrmConfig(url: string): Options<PostgreSqlDriver> {
|
||||
export function makeOrmConfig(
|
||||
url: string,
|
||||
ssl: boolean,
|
||||
): Options<PostgreSqlDriver> {
|
||||
return {
|
||||
type: 'postgresql',
|
||||
clientUrl: url,
|
||||
|
@ -13,6 +16,11 @@ export function makeOrmConfig(url: string): Options<PostgreSqlDriver> {
|
|||
pathTs: './migrations',
|
||||
path: './migrations',
|
||||
},
|
||||
driverOptions: {
|
||||
connection: {
|
||||
ssl,
|
||||
},
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -20,9 +28,10 @@ export async function createORM(
|
|||
url: string,
|
||||
debug: boolean,
|
||||
log: (msg: string) => void,
|
||||
ssl: boolean,
|
||||
) {
|
||||
return await MikroORM.init<PostgreSqlDriver>({
|
||||
...makeOrmConfig(url),
|
||||
...makeOrmConfig(url, ssl),
|
||||
logger: log,
|
||||
debug,
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue