Skip intermediate login page with single provider

[bookstack] / app / Config / mail.php

diff --git a/app/Config/mail.php b/app/Config/mail.php
index 49407bd8eae1f34d08931795f95c4d893ee63a09..b223e382a515c6723a9c52be76d10a04494eb841 100644 (file)
--- a/app/Config/mail.php
+++ b/app/Config/mail.php
@@ -11,7 +11,9 @@
 return [
 
     // Mail driver to use.
 return [
 
     // Mail driver to use.

-    // Options: smtp, mail, sendmail, log
+    // From Laravel 7+ this is MAIL_MAILER in laravel.
+    // Kept as MAIL_DRIVER in BookStack to prevent breaking change.
+    // Options: smtp, sendmail, log, array

     'driver' => env('MAIL_DRIVER', 'smtp'),
 
     // SMTP host address
     'driver' => env('MAIL_DRIVER', 'smtp'),
 
     // SMTP host address


@@ -23,7 +25,7 @@ return [
     // Global "From" address & name
     'from' => [
         'address' => env('MAIL_FROM', '[email protected]'),
     // Global "From" address & name
     'from' => [
         'address' => env('MAIL_FROM', '[email protected]'),

-        'name' => env('MAIL_FROM_NAME','BookStack')
+        'name'    => env('MAIL_FROM_NAME', 'BookStack'),

     ],
 
     // Email encryption protocol
     ],
 
     // Email encryption protocol


@@ -46,4 +48,10 @@ return [
         ],
     ],
 
         ],
     ],
 

+    // Log Channel
+    // If you are using the "log" driver, you may specify the logging channel
+    // if you prefer to keep mail messages separate from other log entries
+    // for simpler reading. Otherwise, the default channel will be used.
+    'log_channel' => env('MAIL_LOG_CHANNEL'),
+

 ];
 ];