diff options
| author | href <href+git-pleroma@random.sh> | 2018-12-14 09:16:03 +0000 |
|---|---|---|
| committer | href <href+git-pleroma@random.sh> | 2018-12-14 09:16:03 +0000 |
| commit | 30dc81667c56216e712564975ed60c062676490b (patch) | |
| tree | b19c9c7588abbf01cfedb5c755106561f0f19371 /config | |
| parent | 262cc6d44b2e77807373cfaff730c938112c5891 (diff) | |
| parent | f81213910fb32505b92fc19270cc483e00862d0c (diff) | |
| download | pleroma-30dc81667c56216e712564975ed60c062676490b.tar.gz pleroma-30dc81667c56216e712564975ed60c062676490b.zip | |
Merge branch '114_user_registration_emails' into 'develop'
[#114] User registration emails
Closes #114
See merge request pleroma/pleroma!531
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.md | 25 | ||||
| -rw-r--r-- | config/dev.exs | 2 | ||||
| -rw-r--r-- | config/test.exs | 2 |
3 files changed, 29 insertions, 0 deletions
diff --git a/config/config.md b/config/config.md index 6b45c01da..165f5d9f8 100644 --- a/config/config.md +++ b/config/config.md @@ -30,6 +30,31 @@ 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 +* `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: + +``` +config :pleroma, Pleroma.Mailer, + adapter: Swoosh.Adapters.Sendgrid, + api_key: "YOUR_API_KEY" +``` + +An example for SMTP adapter: +``` +config :pleroma, Pleroma.Mailer, + adapter: Swoosh.Adapters.SMTP, + relay: "smtp.gmail.com", + username: "YOUR_USERNAME@gmail.com", + password: "YOUR_SMTP_PASSWORD", + port: 465, + ssl: true, + tls: :always, + auth: :always +``` + ## :uri_schemes * `valid_schemes`: List of the scheme part that is considered valid to be an URL diff --git a/config/dev.exs b/config/dev.exs index 166be721a..080a2f8db 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -17,6 +17,8 @@ config :pleroma, Pleroma.Web.Endpoint, check_origin: false, watchers: [] +config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Local + # ## SSL Support # # In order to use HTTPS in development, a self-signed diff --git a/config/test.exs b/config/test.exs index ca10a616c..5c6acfead 100644 --- a/config/test.exs +++ b/config/test.exs @@ -11,6 +11,8 @@ config :logger, level: :warn config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads" +config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Test + # Configure your database config :pleroma, Pleroma.Repo, adapter: Ecto.Adapters.Postgres, |