Merge pull request #5917 from BookStackApp/copy_references

[bookstack] / app / Config / mail.php

diff --git a/app/Config/mail.php b/app/Config/mail.php
index b57c152d9d8062384ca9ed38d0d14fe9386a540c..7256ce8848ebec593b67109df19c2d651635e47e 100644 (file)
--- a/app/Config/mail.php
+++ b/app/Config/mail.php
@@ -8,6 +8,11 @@
  * 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);
+$mailPort = intval(env('MAIL_PORT', 587));
+

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


@@ -18,7 +23,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,13 +32,15 @@ return [
     'mailers' => [
         'smtp' => [
             'transport' => 'smtp',
     'mailers' => [
         'smtp' => [
             'transport' => 'smtp',

+            'scheme' => null,

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

-            'port' => env('MAIL_PORT', 587),
-            'encryption' => env('MAIL_ENCRYPTION', 'tls'),
+            'port' => $mailPort,

             'username' => env('MAIL_USERNAME'),
             'password' => env('MAIL_PASSWORD'),
             'username' => env('MAIL_USERNAME'),
             'password' => env('MAIL_PASSWORD'),

+            'verify_peer' => env('MAIL_VERIFY_SSL', true),

             'timeout' => null,
             'timeout' => null,

-            'local_domain' => env('MAIL_EHLO_DOMAIN'),
+            'local_domain' => null,
+            'require_tls' => ($mailEncryption === 'tls' || $mailEncryption === 'ssl' || $mailPort === 465),

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


@@ -58,12 +65,4 @@ return [
             ],
         ],
     ],
             ],
         ],
     ],

-
-    // Email markdown configuration
-    'markdown' => [
-        'theme' => 'default',
-        'paths' => [
-            resource_path('views/vendor/mail'),
-        ],
-    ],

 ];
 ];