Merge branch 'feature/bbs' into 'develop'

BBS / SSH

See merge request pleroma/pleroma!997
This commit is contained in:
lambda 2019-05-06 17:17:03 +00:00
commit aacac9da0b
8 changed files with 275 additions and 2 deletions

View file

@ -445,6 +445,9 @@ config :pleroma, :ldap,
base: System.get_env("LDAP_BASE") || "dc=example,dc=com",
uid: System.get_env("LDAP_UID") || "cn"
config :esshd,
enabled: false
oauth_consumer_strategies = String.split(System.get_env("OAUTH_CONSUMER_STRATEGIES") || "")
ueberauth_providers =