Skip to content

Commit

Permalink
Fix rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
monotok committed Jan 14, 2023
1 parent a2c414f commit 0539a22
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions server/libs/infra/src/db/config/database.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@ let envBasedDatabaseConfig = {
username: process.env.DB_USERNAME,
password: process.env.DB_PASSWORD,
database: process.env.DB_DATABASE_NAME,
entities: [__dirname + '/../**/*.entity.{js,ts}'],
synchronize: false,
migrations: [__dirname + '/../migrations/*.{js,ts}'],
migrationsRun: true,
ssl: process.env.DB_SSL === 'True'
? { rejectUnauthorized: false }
: false,
connectTimeoutMS: 10000, // 10 seconds
};

Expand All @@ -31,4 +24,4 @@ additionalSSLDatabaseConfig = url ? ({ url }) : (envBasedDatabaseConfig)

export const databaseConfig: PostgresConnectionOptions = {...baseDatabaseConfig, ...additionalSSLDatabaseConfig};

export const dataSource = new DataSource(databaseConfig);
export const dataSource = new DataSource(databaseConfig);

0 comments on commit 0539a22

Please sign in to comment.