Merge pull request #4867 from punit2502/master

Added Elastic Email
This commit is contained in:
Jeff Atwood 2017-05-16 15:13:35 -07:00 committed by GitHub
commit 3958b87c5c
1 changed files with 8 additions and 0 deletions

View File

@ -13,6 +13,13 @@ Enter these values when prompted by `./discourse-setup` per the [install guide](
SMTP server address? smtp.sparkpostmail.com SMTP server address? smtp.sparkpostmail.com
SMTP user name? SMTP_Injection SMTP user name? SMTP_Injection
SMTP password? [Any API key with Send via SMTP permission] SMTP password? [Any API key with Send via SMTP permission]
#### [Elastic Email][ee] — 150k emails/month
SMTP server address? smtp.elasticemail.com
SMTP user name? [Your registered email address]
SMTP password? [Elastic Email API Key]
SMTP port? 2525
#### [SendGrid][sg] — 40k emails on a 30 day trial #### [SendGrid][sg] — 40k emails on a 30 day trial
@ -33,6 +40,7 @@ We recommend creating an [API Key][sg2] instead of using your SendGrid username
Go to [My Account page](https://www.mailjet.com/account) and click on the ["SMTP and SEND API Settings"](https://www.mailjet.com/account/setup) link. Go to [My Account page](https://www.mailjet.com/account) and click on the ["SMTP and SEND API Settings"](https://www.mailjet.com/account/setup) link.
[sp]: https://www.sparkpost.com/ [sp]: https://www.sparkpost.com/
[ee]: https://elasticemail.com
[jet]: https://www.mailjet.com/pricing [jet]: https://www.mailjet.com/pricing
[gun]: http://www.mailgun.com/ [gun]: http://www.mailgun.com/
[sg]: https://sendgrid.com/ [sg]: https://sendgrid.com/