diff options
| author | Alex S <alex.strizhakov@gmail.com> | 2019-04-13 12:24:38 +0700 |
|---|---|---|
| committer | Alex S <alex.strizhakov@gmail.com> | 2019-04-13 12:24:38 +0700 |
| commit | c349573791bfaca6e8c8c86c519c23397b088967 (patch) | |
| tree | d98225031c8ad1b3efe7c2917fd911d369953ca7 /docs/config.md | |
| parent | a64eb2b3893cee61f50d89b6ad4d273031ef0ea9 (diff) | |
| parent | 334b2d78dc068f65fabf5b11aaa737dfd742d2f4 (diff) | |
| download | pleroma-c349573791bfaca6e8c8c86c519c23397b088967.tar.gz | |
Merge develop to 788-separate-email-addresses
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
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 7d3a482b3..66e68229d 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", @@ -318,7 +318,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) |