Merge pull request #33 from Omkaragrawal/SSL-pg-mail

Fixed issue with pg and mail SSL

3 files changed, 5 insertions, 2 deletions

diff --git a/.env.example b/.env.example
index ba46d99..8129f06 100644
--- a/.env.example
+++ b/.env.example
@@ -17,6 +17,8 @@ DB_USER=root
 DB_PASSWORD=
 DB_DATABASE=adonis
 
+DB_SSL=false
+
 HASH_DRIVER=bcrypt
 
 IS_CREATION_ENABLED=true
@@ -30,4 +32,4 @@ SMTP_HOST=127.0.0.1
 MAIL_USERNAME=username
 MAIL_PASSWORD=password
 MAIL_SENDER=noreply@getferdi.com
-SSL=false
+MAIL_SSL=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),
   },
diff --git a/config/mail.js b/config/mail.js
index f128ce2..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: Env.get('SSL', false), // true for 465, false for other ports,
+    secure: JSON.parse(Env.get("MAIL_SSL", Env.get('SSL', false))),
     authMethod: 'LOGIN',
     auth: {
       user: Env.get('MAIL_USERNAME'),