diff options
| author | lambda <lain@soykaf.club> | 2019-04-12 10:41:09 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-04-12 10:41:09 +0000 |
| commit | 184ae60b217f4e3a79aad538717d1cf35f10291a (patch) | |
| tree | ce7633ae3f388e1cf7618d39512a196ec59c93f3 /docs/config.md | |
| parent | 0a09692c7decdcaa8c15e5f8eaf10d9e7d16a5e5 (diff) | |
| parent | 9c1b36856b97a7f86e60ad23ef374449c1910c7a (diff) | |
| download | pleroma-184ae60b217f4e3a79aad538717d1cf35f10291a.tar.gz | |
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
Diffstat (limited to 'docs/config.md')
| -rw-r--r-- | docs/config.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/config.md b/docs/config.md index b5ea58746..e286104df 100644 --- a/docs/config.md +++ b/docs/config.md @@ -31,14 +31,14 @@ This filter replaces the filename (not the path) of an upload. For complete obfu * `text`: Text to replace filenames in links. If empty, `{random}.extension` will be used. -## Pleroma.Mailer +## Pleroma.Emails.Mailer * `adapter`: one of the mail adapters listed in [Swoosh readme](https://github.com/swoosh/swoosh#adapters), or `Swoosh.Adapters.Local` for in-memory mailbox. * `api_key` / `password` and / or other adapter-specific settings, per the above documentation. An example for Sendgrid adapter: ```exs -config :pleroma, Pleroma.Mailer, +config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendgrid, api_key: "YOUR_API_KEY" ``` @@ -46,7 +46,7 @@ config :pleroma, Pleroma.Mailer, An example for SMTP adapter: ```exs -config :pleroma, Pleroma.Mailer, +config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.SMTP, relay: "smtp.gmail.com", username: "YOUR_USERNAME@gmail.com", @@ -317,7 +317,7 @@ Pleroma has the following queues: * `federator_outgoing` - Outgoing federation * `federator_incoming` - Incoming federation -* `mailer` - Email sender, see [`Pleroma.Mailer`](#pleroma-mailer) +* `mailer` - Email sender, see [`Pleroma.Emails.Mailer`](#pleroma-emails-mailer) * `transmogrifier` - Transmogrifier * `web_push` - Web push notifications * `scheduled_activities` - Scheduled activities, see [`Pleroma.ScheduledActivities`](#pleromascheduledactivity) |