diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2024-09-17 13:45:15 +0200 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2024-09-17 13:45:15 +0200 |
| commit | 76cfc6127fa05a8c5214d1dff368bad0e0a0b1a8 (patch) | |
| tree | 5a63ebd265d8fa97f677e5f86dbb1de776f60936 /config | |
| parent | 309d22aca2ec0557b27c8e3d8d12b088061e0142 (diff) | |
| parent | e7176bb998a7e20f2bb3c9f32e1e2dfe8c3cd818 (diff) | |
| download | pleroma-76cfc6127fa05a8c5214d1dff368bad0e0a0b1a8.tar.gz pleroma-76cfc6127fa05a8c5214d1dff368bad0e0a0b1a8.zip | |
Merge remote-tracking branch 'origin/develop' into ensure-authorized-fetch
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 b910b160d..4e088d574 100644 --- a/config/config.exs +++ b/config/config.exs @@ -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") |