From 600493f1cb3c7d319b53877a7135253e07ba9304 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias.brunner@vshn.ch>
Date: Wed, 9 Sep 2015 16:59:07 +0200
Subject: [PATCH 1/2] new MAIL_ENCRYPTION parameter

Make the encryption parameter of the mail transport configuration
configurable with an environment variable. Default is still the
same: tls
---
 config/mail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mail.php b/config/mail.php
index 3588fece..d0584d7d 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -76,7 +76,7 @@ return [
     |
     */
 
-    'encryption' => 'tls',
+    'encryption' => env('MAIL_ENCRYPTION', 'tls'),
 
     /*
     |--------------------------------------------------------------------------

From 4dd839719fa61b0723bb6bc082d192d54e02f842 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@tobru.ch>
Date: Wed, 9 Sep 2015 22:30:53 +0200
Subject: [PATCH 2/2] add example for MAIL_ENCRYPTION to example env file

---
 .env.example | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.env.example b/.env.example
index 85c538ef..9ef5bf75 100644
--- 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