From: Ivan Tashkinov <ivant.business@gmail.com>
Date: Tue, 2 Apr 2019 10:50:12 +0000 (+0300)
Subject: [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=590c935d95f0ea4fb65994027a88a0623527af88;p=akkoma

[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

# Conflicts:
#	mix.exs
---

590c935d95f0ea4fb65994027a88a0623527af88
diff --cc config/config.exs
index 2dc87a50c,dccf7b263..604290544
--- a/config/config.exs
+++ b/config/config.exs
@@@ -378,24 -378,8 +378,26 @@@ config :pleroma, :ldap
    base: System.get_env("LDAP_BASE") || "dc=example,dc=com",
    uid: System.get_env("LDAP_UID") || "cn"
  
 +oauth_consumer_strategies = String.split(System.get_env("OAUTH_CONSUMER_STRATEGIES") || "")
 +
 +ueberauth_providers =
 +  for strategy <- oauth_consumer_strategies do
 +    strategy_module_name = "Elixir.Ueberauth.Strategy.#{String.capitalize(strategy)}"
 +    strategy_module = String.to_atom(strategy_module_name)
 +    {String.to_atom(strategy), {strategy_module, [callback_params: ["state"]]}}
 +  end
 +
 +config :ueberauth,
 +       Ueberauth,
 +       base_path: "/oauth",
 +       providers: ueberauth_providers
 +
 +config :pleroma, :auth,
 +  oauth_consumer_strategies: oauth_consumer_strategies,
 +  oauth_consumer_enabled: oauth_consumer_strategies != []
 +
+ config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Sendmail
+ 
  # Import environment specific config. This must remain at the bottom
  # of this file so it overrides the configuration defined above.
  import_config "#{Mix.env()}.exs"