System CLI: Updated to 126de5599c state

[bookstack] / app / Config / mail.php

diff --git a/app/Config/mail.php b/app/Config/mail.php
index 87514aa409809c875cbe5523404214c440e71dba..2906d769afd929cac8d76f3d502472d6bda4d438 100644 (file)
--- a/app/Config/mail.php
+++ b/app/Config/mail.php
@@ -8,6 +8,10 @@
  * Do not edit this file unless you're happy to maintain any changes yourself.
  */
 
  * Do not edit this file unless you're happy to maintain any changes yourself.
  */
 

+// Configured mail encryption method.
+// STARTTLS should still be attempted, but tls/ssl forces TLS usage.
+$mailEncryption = env('MAIL_ENCRYPTION', null);
+

 return [
 
     // Mail driver to use.
 return [
 
     // Mail driver to use.


@@ -18,7 +22,7 @@ return [
 
     // Global "From" address & name
     'from' => [
 
     // Global "From" address & name
     'from' => [

-        'address' => env('MAIL_FROM', 'mail@bookstackapp.com'),
+        'address' => env('MAIL_FROM', 'bookstack@example.com'),

         'name'    => env('MAIL_FROM_NAME', 'BookStack'),
     ],
 
         'name'    => env('MAIL_FROM_NAME', 'BookStack'),
     ],
 


@@ -27,14 +31,15 @@ return [
     'mailers' => [
         'smtp' => [
             'transport' => 'smtp',
     'mailers' => [
         'smtp' => [
             'transport' => 'smtp',

+            'scheme' => null,

             'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
             'port' => env('MAIL_PORT', 587),
             'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
             'port' => env('MAIL_PORT', 587),

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

             'username' => env('MAIL_USERNAME'),
             'password' => env('MAIL_PASSWORD'),
             'verify_peer' => env('MAIL_VERIFY_SSL', true),
             'timeout' => null,
             'local_domain' => env('MAIL_EHLO_DOMAIN'),
             'username' => env('MAIL_USERNAME'),
             'password' => env('MAIL_PASSWORD'),
             'verify_peer' => env('MAIL_VERIFY_SSL', true),
             'timeout' => null,
             'local_domain' => env('MAIL_EHLO_DOMAIN'),

+            'tls_required' => ($mailEncryption === 'tls' || $mailEncryption === 'ssl'),

         ],
 
         'sendmail' => [
         ],
 
         'sendmail' => [