forked from BookStackApp/BookStack
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Mail Config: Updated how TLS is configured
After full review of current MAIL_ENCRYPTION usage in laravel and smyfony mailer, this updates the options in BookStack to be simplified and specific in usage: - Removed mail.mailers.smtp.encryption option since it did not actually affect anything in the current state of dependancies. - Updated MAIL_ENCRYPTION so values of tls OR ssl will force-enable tls via 'scheme' option with laravel passes to the SMTP transfport, which Smyfony uses as an indicator to force TLS. When MAIL_ENCRYPTION is not used, STARTTLS will still be attempted by symfony mailer. Updated .env files to refer to BookStack docs (which was updated for this) and to reflect correct default port. Related to BookStackApp#4342
- Loading branch information
1 parent
9ae17ef
commit dbb6c87
Showing
4 changed files
with
51 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -37,8 +37,10 @@ [email protected] | |
# SMTP mail options | ||
# These settings can be checked using the "Send a Test Email" | ||
# feature found in the "Settings > Maintenance" area of the system. | ||
# For more detailed documentation on mail options, refer to: | ||
# https://www.bookstackapp.com/docs/admin/email-webhooks/#email-configuration | ||
MAIL_HOST=localhost | ||
MAIL_PORT=1025 | ||
MAIL_PORT=587 | ||
MAIL_USERNAME=null | ||
MAIL_PASSWORD=null | ||
MAIL_ENCRYPTION=null |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -69,23 +69,19 @@ DB_PASSWORD=database_user_password | |
# certificate itself (Common Name or Subject Alternative Name). | ||
MYSQL_ATTR_SSL_CA="/path/to/ca.pem" | ||
|
||
# Mail system to use | ||
# Can be 'smtp' or 'sendmail' | ||
# Mail configuration | ||
# Refer to https://www.bookstackapp.com/docs/admin/email-webhooks/#email-configuration | ||
MAIL_DRIVER=smtp | ||
|
||
# Mail sending options | ||
[email protected] | ||
MAIL_FROM_NAME=BookStack | ||
|
||
# SMTP mail options | ||
MAIL_HOST=localhost | ||
MAIL_PORT=1025 | ||
MAIL_PORT=587 | ||
MAIL_USERNAME=null | ||
MAIL_PASSWORD=null | ||
MAIL_ENCRYPTION=null | ||
MAIL_VERIFY_SSL=true | ||
|
||
# Command to use when email is sent via sendmail | ||
MAIL_SENDMAIL_COMMAND="/usr/sbin/sendmail -bs" | ||
|
||
# Cache & Session driver to use | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters