From a5811d44ace95651bdbda0122be8ee542b0243dc Mon Sep 17 00:00:00 2001 From: Faruk AYDIN Date: Tue, 23 Nov 2021 14:32:52 +0100 Subject: [PATCH] chore: Add env variable to toggle postgresql ssl flag --- packages/backend/.env-example | 3 ++- packages/backend/knexfile.ts | 2 +- packages/backend/src/config/app.ts | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/backend/.env-example b/packages/backend/.env-example index 0edc15f7..ea045629 100644 --- a/packages/backend/.env-example +++ b/packages/backend/.env-example @@ -7,4 +7,5 @@ POSTGRES_DATABASE=automatisch_development POSTGRES_PORT=5432 POSTGRES_HOST=localhost POSTGRES_USERNAME=automatish_development_user -POSTGRESS_PASSWORD= +POSTGRES_PASSWORD= +POSTGRES_ENABLE_SSL=false diff --git a/packages/backend/knexfile.ts b/packages/backend/knexfile.ts index b9a23889..060e24cd 100644 --- a/packages/backend/knexfile.ts +++ b/packages/backend/knexfile.ts @@ -8,7 +8,7 @@ const knexConfig = { user: appConfig.postgresUsername, password: appConfig.postgresPassword, database: appConfig.postgresDatabase, - ssl: true, + ssl: appConfig.postgresEnableSsl }, migrations: { directory: __dirname + '/src/db/migrations', diff --git a/packages/backend/src/config/app.ts b/packages/backend/src/config/app.ts index 3c396597..a2f50da1 100644 --- a/packages/backend/src/config/app.ts +++ b/packages/backend/src/config/app.ts @@ -12,6 +12,7 @@ type AppConfig = { postgresHost: string, postgresUsername: string, postgresPassword: string, + postgresEnableSsl: boolean, baseUrl?: string } @@ -25,7 +26,8 @@ const appConfig: AppConfig = { postgresPort: parseInt(process.env.POSTGRES_PORT) || 5432, postgresHost: process.env.POSTGRES_HOST || 'localhost', postgresUsername: process.env.POSTGRES_USERNAME || 'automatish_development_user', - postgresPassword: process.env.POSTGRESS_PASSWORD, + postgresPassword: process.env.POSTGRES_PASSWORD, + postgresEnableSsl: process.env.POSTGRES_ENABLE_SSL === 'true' ? true : false, } const baseUrl = `${appConfig.protocol}://${appConfig.host}:${appConfig.port}`;