summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMaksim <parallel588@gmail.com>2019-07-10 05:34:21 +0000
committerkaniini <nenolod@gmail.com>2019-07-10 05:34:21 +0000
commit12b1454245fc2efba22d5633f65539dac727ee3d (patch)
tree32253756380f31002c726caa8782ab3e634d25c4 /config
parentb00620b378fea818bcbde49b70548a574b706796 (diff)
downloadpleroma-12b1454245fc2efba22d5633f65539dac727ee3d.tar.gz
pleroma-12b1454245fc2efba22d5633f65539dac727ee3d.zip
[#1062] added option to disable send email
Diffstat (limited to 'config')
-rw-r--r--config/config.exs2
-rw-r--r--config/test.exs2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs
index 09681f122..0d3419102 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -501,7 +501,7 @@ config :ueberauth,
config :pleroma, :auth, oauth_consumer_strategies: oauth_consumer_strategies
-config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail
+config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false
config :prometheus, Pleroma.Web.Endpoint.MetricsExporter, path: "/api/pleroma/app_metrics"
diff --git a/config/test.exs b/config/test.exs
index 63443dde0..19d7cca5f 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -23,7 +23,7 @@ config :pleroma, Pleroma.Upload, filters: [], link_name: false
config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads"
-config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Test
+config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Test, enabled: true
config :pleroma, :instance,
email: "admin@example.com",