From f19986275dedec2dc512dece4855c107b3ff7bcc Mon Sep 17 00:00:00 2001 From: OMKAR AGRAWAL Date: Wed, 15 Jul 2020 18:38:49 +0530 Subject: Fixed issue with pg SSL --- .env.example | 8 ++++++++ config/database.js | 1 + 2 files changed, 9 insertions(+) diff --git a/.env.example b/.env.example index db9ae1d..94a6304 100644 --- a/.env.example +++ b/.env.example @@ -16,6 +16,14 @@ DB_USER=root DB_PASSWORD= DB_DATABASE=adonis +DB_CONNECTION=pg +DB_HOST=127.0.0.1 +DB_PORT=5432 +DB_USER=postgres +DB_PASSWORD= +DB_DATABASE=postgres +DB_SSL=false + HASH_DRIVER=bcrypt IS_CREATION_ENABLED=true diff --git a/config/database.js b/config/database.js index 0e9cfba..165bba4 100644 --- a/config/database.js +++ b/config/database.js @@ -77,6 +77,7 @@ module.exports = { user: Env.get('DB_USER', 'root'), password: Env.get('DB_PASSWORD', ''), database: Env.get('DB_DATABASE', 'adonis'), + ssl: JSON.parse(Env.get('DB_SSL', 'true')), }, debug: Env.get('DB_DEBUG', false), }, -- cgit v1.2.3-70-g09d2 From b9f606ba2e2e92838bf25d63b8006157921d8fac Mon Sep 17 00:00:00 2001 From: OMKAR AGRAWAL Date: Wed, 15 Jul 2020 20:09:12 +0530 Subject: added env variable MAIL_SSL --- .env.example | 3 ++- config/mail.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.env.example b/.env.example index 94a6304..12755ae 100644 --- a/.env.example +++ b/.env.example @@ -36,4 +36,5 @@ SMTP_PORT=2525 SMTP_HOST=127.0.0.1 MAIL_USERNAME=username MAIL_PASSWORD=password -MAIL_SENDER=noreply@getferdi.com \ No newline at end of file +MAIL_SENDER=noreply@getferdi.com +MAIL_SSL=true \ No newline at end of file diff --git a/config/mail.js b/config/mail.js index 6b18db2..50a7848 100644 --- a/config/mail.js +++ b/config/mail.js @@ -27,7 +27,7 @@ module.exports = { pool: true, port: Env.get('SMTP_PORT', 2525), host: Env.get('SMTP_HOST'), - secure: false, + secure: JSON.parse(Env.get("MAIL_SSL", "true")), auth: { user: Env.get('MAIL_USERNAME'), pass: Env.get('MAIL_PASSWORD') -- cgit v1.2.3-70-g09d2 From 31c6d27167f6a016ea8aa279f266574b49a5e939 Mon Sep 17 00:00:00 2001 From: OMKAR AGRAWAL Date: Sat, 25 Jul 2020 02:21:20 +0530 Subject: Changes made as requested --- .env.example | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.env.example b/.env.example index 12755ae..b25a2f3 100644 --- a/.env.example +++ b/.env.example @@ -16,12 +16,6 @@ DB_USER=root DB_PASSWORD= DB_DATABASE=adonis -DB_CONNECTION=pg -DB_HOST=127.0.0.1 -DB_PORT=5432 -DB_USER=postgres -DB_PASSWORD= -DB_DATABASE=postgres DB_SSL=false HASH_DRIVER=bcrypt -- cgit v1.2.3-70-g09d2 From 80b2fed3cce72e152e0e5c5b27e38b4cb415f17a Mon Sep 17 00:00:00 2001 From: OMKAR AGRAWAL Date: Tue, 13 Oct 2020 21:31:15 +0530 Subject: Update config/mail.js Added MAIL_SSL as an alias for SSL Co-authored-by: Bennett --- config/mail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/mail.js b/config/mail.js index 88edd05..b876f19 100644 --- a/config/mail.js +++ b/config/mail.js @@ -30,7 +30,7 @@ module.exports = { name: Env.get('EXTERNAL_DOMAIN'), port: Env.get('SMTP_PORT', 2525), host: Env.get('SMTP_HOST'), - secure: JSON.parse(Env.get("MAIL_SSL", "true")), + secure: JSON.parse(Env.get("MAIL_SSL", Env.get('SSL', false))), authMethod: 'LOGIN', auth: { user: Env.get('MAIL_USERNAME'), -- cgit v1.2.3-70-g09d2