diff options
| author | Mark Felder <feld@feld.me> | 2024-09-16 11:51:22 -0400 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2024-09-16 11:51:22 -0400 |
| commit | e24e107f3d3ae6024068c6509a7cb0582ea4bf02 (patch) | |
| tree | 902c179c947643e520579d49b80480eef86e2495 /config | |
| parent | e59706c201bd71525c0a15008c3cb5dcdfb73289 (diff) | |
| parent | 3a0d4e98374d77fd6721034362677984b97d2cab (diff) | |
| download | pleroma-e24e107f3d3ae6024068c6509a7cb0582ea4bf02.tar.gz pleroma-e24e107f3d3ae6024068c6509a7cb0582ea4bf02.zip | |
Merge remote-tracking branch 'origin/develop' into retry-tests
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index cd9a2539f..f53a083d0 100644 --- a/config/config.exs +++ b/config/config.exs @@ -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") |