diff options
| author | lambda <lain@soykaf.club> | 2019-05-06 17:17:03 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-05-06 17:17:03 +0000 |
| commit | aacac9da0beddcf797958acca330747b8f2d1f06 (patch) | |
| tree | 5b4d092b04dd092e366c25ebd6efb701c14e4528 /config | |
| parent | 4dabf64af45232afdbbb15d9a697a64e15a749ee (diff) | |
| parent | eb0fb73ddbed109ca4dcd758b60a25ff0dafc883 (diff) | |
| download | pleroma-aacac9da0beddcf797958acca330747b8f2d1f06.tar.gz pleroma-aacac9da0beddcf797958acca330747b8f2d1f06.zip | |
Merge branch 'feature/bbs' into 'develop'
BBS / SSH
See merge request pleroma/pleroma!997
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 12dbe9941..7792e9a87 100644 --- a/config/config.exs +++ b/config/config.exs @@ -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 = |