Merge branch 'ldap-tls' into 'develop'
LDAP: permit overriding the CA root, improve SSL/TLS See merge request pleroma/pleroma!4265
This commit is contained in:
commit
3a0d4e9837
6 changed files with 58 additions and 29 deletions
|
|
@ -619,7 +619,9 @@ config :pleroma, :ldap,
|
|||
tls: System.get_env("LDAP_TLS") == "true",
|
||||
tlsopts: [],
|
||||
base: System.get_env("LDAP_BASE") || "dc=example,dc=com",
|
||||
uid: System.get_env("LDAP_UID") || "cn"
|
||||
uid: System.get_env("LDAP_UID") || "cn",
|
||||
# defaults to CAStore's Mozilla roots
|
||||
cacertfile: nil
|
||||
|
||||
oauth_consumer_strategies =
|
||||
System.get_env("OAUTH_CONSUMER_STRATEGIES")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue