Merge pull request #938 from tobru/feature_mailencryption

new MAIL_ENCRYPTION parameter
2015-09-10 08:31:59 +01:00
parent 45181bfe5c 4dd839719f
commit 2fbc044057
2 changed files with 2 additions and 1 deletions
--- a/.env.example
+++ b/.env.example
@@ -20,6 +20,7 @@ MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ADDRESS=null
 MAIL_NAME=null
+MAIL_ENCRYPTION=tls

 REDIS_HOST=null
 REDIS_DATABASE=null
--- a/config/mail.php
+++ b/config/mail.php
@@ -76,7 +76,7 @@ return [
    |
    */

-    'encryption' => 'tls',
+    'encryption' => env('MAIL_ENCRYPTION', 'tls'),

    /*
    |--------------------------------------------------------------------------