From b670702f41c6ca8c497f1ca5c26bb0c8a27fed63 Mon Sep 17 00:00:00 2001 From: David Mehren Date: Mon, 18 Apr 2022 15:29:36 +0200 Subject: [PATCH] feat: Use real database config for app Signed-off-by: David Mehren --- src/app.module.ts | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/app.module.ts b/src/app.module.ts index a8ce19c48..4771a5d7d 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -17,7 +17,7 @@ import appConfig from './config/app.config'; import authConfig from './config/auth.config'; import cspConfig from './config/csp.config'; import customizationConfig from './config/customization.config'; -import databaseConfig from './config/database.config'; +import databaseConfig, { DatabaseConfig } from './config/database.config'; import externalConfig from './config/external-services.config'; import hstsConfig from './config/hsts.config'; import mediaConfig from './config/media.config'; @@ -49,11 +49,21 @@ const routes: Routes = [ @Module({ imports: [ RouterModule.forRoutes(routes), - TypeOrmModule.forRoot({ - type: 'sqlite', - database: './hedgedoc.sqlite', - autoLoadEntities: true, - synchronize: true, // ToDo: Remove this before release + TypeOrmModule.forRootAsync({ + imports: [ConfigModule], + inject: [databaseConfig.KEY], + useFactory: (databaseConfig: DatabaseConfig) => { + return { + type: databaseConfig.type, + host: databaseConfig.host, + port: databaseConfig.port, + username: databaseConfig.username, + password: databaseConfig.password, + database: databaseConfig.database, + autoLoadEntities: true, + synchronize: true, // ToDo: Remove this before release + }; + }, }), ConfigModule.forRoot({ load: [