kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Updated config after upgrade to Laravel 5.2

Browse Source
This commit is contained in:
James Cole
2016-01-08 15:59:21 +01:00
parent 180ec52798
commit 013e16e15f
12 changed files with 271 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
config/mail.php Normal file → Executable file
View File

@@ -11,12 +11,11 @@ return [
| sending of e-mail. You may specify which one you're using throughout
| your application here. By default, Laravel is setup for SMTP mail.
|
| Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill", "log"
| Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill", "ses", "log"
|
*/
'blocked_domains' => explode(',', env('BLOCKED_DOMAINS')),
'driver' => env('EMAIL_DRIVER', 'smtp'),
'driver' => env('MAIL_DRIVER', 'smtp'),
/*
|--------------------------------------------------------------------------
@@ -29,7 +28,7 @@ return [
|
*/
'host' => env('EMAIL_SMTP', 'smtp.mailgun.org'),
'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
/*
|--------------------------------------------------------------------------
@@ -42,7 +41,7 @@ return [
|
*/
'port' => 587,
'port' => env('MAIL_PORT', 587),
/*
|--------------------------------------------------------------------------
@@ -68,7 +67,7 @@ return [
|
*/
'encryption' => 'tls',
'encryption' => env('MAIL_ENCRYPTION', 'tls'),
/*
|--------------------------------------------------------------------------
@@ -81,7 +80,7 @@ return [
|
*/
'username' => env('EMAIL_USERNAME', null),
'username' => env('MAIL_USERNAME'),
/*
|--------------------------------------------------------------------------
@@ -94,7 +93,7 @@ return [
|
*/
'password' => env('EMAIL_PASSWORD', null),
'password' => env('MAIL_PASSWORD'),
/*
|--------------------------------------------------------------------------
@@ -109,17 +108,4 @@ return [
'sendmail' => '/usr/sbin/sendmail -bs',
/*
|--------------------------------------------------------------------------
| Mail "Pretend"
|--------------------------------------------------------------------------
|
| When this option is enabled, e-mail will not actually be sent over the
| web and will instead be written to your application's logs files so
| you may inspect the message. This is great for local development.
|
*/
'pretend' => env('EMAIL_PRETEND', false),
];