hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into ensure-authorized-fetch

Browse source
This commit is contained in:
marcin mikołajczak 2024-09-17 13:45:15 +02:00
commit 76cfc6127f
9 changed files with 84 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/config.exs
View file

@ -620,7 +620,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")