kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 16:57:09 +00:00
Code Issues Projects Releases Wiki Activity

Fix #9398

Browse Source
This commit is contained in:
James Cole
2025-04-07 20:42:52 +02:00
parent fd9b0d9417
commit c483e0768f
2 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.env.example
View File

@@ -164,6 +164,13 @@ MAIL_PASSWORD=null
MAIL_ENCRYPTION=null MAIL_ENCRYPTION=null
MAIL_SENDMAIL_COMMAND= MAIL_SENDMAIL_COMMAND=
#
# If you use self-signed certificates for your STMP server, you can use the following settings.
#
MAIL_ALLOW_SELF_SIGNED=false
MAIL_VERIFY_PEER=true
MAIL_VERIFY_PEER_NAME=true
# Other mail drivers: # Other mail drivers:
# If you use Docker or similar, you can set these variables from a file by appending them with _FILE # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
MAILGUN_DOMAIN= MAILGUN_DOMAIN=

39
config/mail.php
View File

@@ -33,18 +33,23 @@ return [
| and used as needed; however, this mailer will be used by default. | and used as needed; however, this mailer will be used by default.
| |
*/ */
'default' => envNonEmpty('MAIL_MAILER', 'log'), 'default' => envNonEmpty('MAIL_MAILER', 'log'),
'mailers' => [ 'mailers' => [
'smtp' => [ 'smtp' => [
'transport' => 'smtp', 'transport' => 'smtp',
'host' => envNonEmpty('MAIL_HOST', 'smtp.mailtrap.io'), 'host' => envNonEmpty('MAIL_HOST', 'smtp.mailtrap.io'),
'port' => (int) env('MAIL_PORT', 2525), 'port' => (int) env('MAIL_PORT', 2525),
'encryption' => envNonEmpty('MAIL_ENCRYPTION', 'tls'), 'encryption' => envNonEmpty('MAIL_ENCRYPTION', 'tls'),
'username' => envNonEmpty('MAIL_USERNAME', 'user@example.com'), 'username' => envNonEmpty('MAIL_USERNAME', 'user@example.com'),
'password' => envNonEmpty('MAIL_PASSWORD', 'password'), 'password' => envNonEmpty('MAIL_PASSWORD', 'password'),
'timeout' => null, 'timeout' => null,
'verify_peer' => null !== env('MAIL_ENCRYPTION'), 'scheme' => env('MAIL_SCHEME'),
'url' => env('MAIL_URL'),
'local_domain' => env('MAIL_EHLO_DOMAIN', parse_url(env('APP_URL', 'http://localhost'), PHP_URL_HOST)),
'verify_peer' => env('MAIL_VERIFY_PEER', true),
'allow_self_signed' => env('MAIL_ALLOW_SELF_SIGNED', false),
'verify_peer_name' => env('MAIL_VERIFY_PEER_NAME', true),
], ],
'mailersend' => [ 'mailersend' => [
'transport' => 'mailersend', 'transport' => 'mailersend',
@@ -53,34 +58,34 @@ return [
'transport' => 'ses', 'transport' => 'ses',
], ],
'mailgun' => [ 'mailgun' => [
'transport' => 'mailgun', 'transport' => 'mailgun',
], ],
'mandrill' => [ 'mandrill' => [
'transport' => 'mandrill', 'transport' => 'mandrill',
], ],
'postmark' => [ 'postmark' => [
'transport' => 'postmark', 'transport' => 'postmark',
], ],
'sendmail' => [ 'sendmail' => [
'transport' => 'sendmail', 'transport' => 'sendmail',
'path' => envNonEmpty('MAIL_SENDMAIL_COMMAND', '/usr/sbin/sendmail -bs'), 'path' => envNonEmpty('MAIL_SENDMAIL_COMMAND', '/usr/sbin/sendmail -bs'),
], ],
'log' => [ 'log' => [
'transport' => 'log', 'transport' => 'log',
'channel' => env('MAIL_LOG_CHANNEL', 'stack'), 'channel' => env('MAIL_LOG_CHANNEL', 'stack'),
'level' => 'info', 'level' => 'info',
], ],
'null' => [ 'null' => [
'transport' => 'log', 'transport' => 'log',
'channel' => env('MAIL_LOG_CHANNEL', 'stack'), 'channel' => env('MAIL_LOG_CHANNEL', 'stack'),
'level' => 'notice', 'level' => 'notice',
], ],
'array' => [ 'array' => [
'transport' => 'array', 'transport' => 'array',
], ],
], ],