Merge branch 'fix/default-mail-adapter' into 'develop'

Add default mail adapter settings to config

See merge request pleroma/pleroma!994
This commit is contained in:
lambda 2019-04-01 21:47:40 +00:00
commit fd7dd8f9a2

View file

@ -378,6 +378,8 @@
base: System.get_env("LDAP_BASE") || "dc=example,dc=com", base: System.get_env("LDAP_BASE") || "dc=example,dc=com",
uid: System.get_env("LDAP_UID") || "cn" uid: System.get_env("LDAP_UID") || "cn"
config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Sendmail
# Import environment specific config. This must remain at the bottom # Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above. # of this file so it overrides the configuration defined above.
import_config "#{Mix.env()}.exs" import_config "#{Mix.env()}.exs"