-
-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update mailer configurations for Symfony mailer
Newer Laravel uses Symfony mailer instead of SwiftMailer, and that means that some configs and functionality have changed In this change, we update config/mail.php with the new config layout and name/functionality changes of note: * New configuration layout supporting lots of new/different mailers * MAIL_DRIVER has become MAIL_MAILER, though we'll support both * MAIL_ENCRYPTION is mostly useless, and we mark it as such -- symfony mailer detects which type of encryption to use automagically. * MAIL_TLS_VERIFY_PEER is now available in case of self-signed certificates on the mail server, of if you want to access it by a different name, or by IP Accordingly, we also update the .env examples, docker configs, and the .env builder in the snipeit.sh installation script with the above changes
- Loading branch information
Jeremy Price
committed
Feb 29, 2024
1 parent
8f2843b
commit 8ace30e
Showing
12 changed files
with
213 additions
and
82 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 |
---|---|---|
|
@@ -49,12 +49,12 @@ DB_SSL_CIPHER=null | |
# -------------------------------------------- | ||
# REQUIRED: OUTGOING MAIL SERVER SETTINGS | ||
# -------------------------------------------- | ||
MAIL_DRIVER=smtp | ||
MAIL_MAILER=smtp | ||
MAIL_HOST=mailhog | ||
MAIL_PORT=1025 | ||
MAIL_USERNAME=null | ||
MAIL_PASSWORD=null | ||
MAIL_ENCRYPTION=null | ||
MAIL_TLS_VERIFY_PEER=true | ||
[email protected] | ||
MAIL_FROM_NAME='Snipe-IT' | ||
[email protected] | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -46,17 +46,21 @@ DB_SSL_CIPHER=null | |
# -------------------------------------------- | ||
# REQUIRED: OUTGOING MAIL SERVER SETTINGS | ||
# -------------------------------------------- | ||
MAIL_DRIVER=smtp | ||
MAIL_MAILER=smtp | ||
MAIL_HOST=email-smtp.us-west-2.amazonaws.com | ||
MAIL_PORT=587 | ||
MAIL_USERNAME=YOURUSERNAME | ||
MAIL_PASSWORD=YOURPASSWORD | ||
MAIL_ENCRYPTION=null | ||
MAIL_FROM_ADDR=[email protected] | ||
MAIL_FROM_NAME='Snipe-IT' | ||
MAIL_REPLYTO_ADDR=[email protected] | ||
MAIL_REPLYTO_NAME='Snipe-IT' | ||
MAIL_AUTO_EMBED_METHOD='attachment' | ||
MAIL_TLS_VERIFY_PEER=true | ||
|
||
# MAIL_ENCRYPTION is no longer supported. SymfonyMailer will use tls if it's | ||
# advertised, and won't if it's not. If you want to use your mail server's IP but it's failing | ||
# because of certificate errors, set MAIL_TLS_VERIFY_PEER-true | ||
|
||
# -------------------------------------------- | ||
# REQUIRED: IMAGE LIBRARY | ||
|
@@ -190,4 +194,4 @@ ARGON_TIME=2 | |
# OPTIONAL: SCIM | ||
# -------------------------------------------- | ||
SCIM_TRACE=false | ||
SCIM_STANDARDS_COMPLIANCE=false | ||
SCIM_STANDARDS_COMPLIANCE=false |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,6 +18,6 @@ APP_KEY=base64:tu9NRh/a6+dCXBDGvg0Gv/0TcABnFsbT4AKxrr8mwQo= | |
LOGIN_MAX_ATTEMPTS=1000000 | ||
LOGIN_LOCKOUT_DURATION=100000000 | ||
|
||
MAIL_DRIVER=log | ||
MAIL_MAILER=log | ||
[email protected] | ||
MAIL_FROM_NAME=Snipe-IT |
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 |
---|---|---|
|
@@ -15,6 +15,6 @@ APP_KEY=base64:tu9NRh/a6+dCXBDGvg0Gv/0TcABnFsbT4AKxrr8mwQo= | |
LOGIN_MAX_ATTEMPTS=1000000 | ||
LOGIN_LOCKOUT_DURATION=100000000 | ||
|
||
MAIL_DRIVER=log | ||
MAIL_MAILER=log | ||
[email protected] | ||
MAIL_FROM_NAME=Snipe-IT |
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
Oops, something went wrong.