diff options
| author | feld <feld@feld.me> | 2024-09-16 15:50:58 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2024-09-16 15:50:58 +0000 |
| commit | 3a0d4e98374d77fd6721034362677984b97d2cab (patch) | |
| tree | 8d7c8721b6718185d8feff1fda1240f1001358e0 /config | |
| parent | 8250a9764ea07a69a701401fd00f6d55e0ef2003 (diff) | |
| parent | 91d1d7260b7084f59ae42e7c4b46c7fb963fda96 (diff) | |
| download | pleroma-3a0d4e98374d77fd6721034362677984b97d2cab.tar.gz pleroma-3a0d4e98374d77fd6721034362677984b97d2cab.zip | |
Merge branch 'ldap-tls' into 'develop'
LDAP: permit overriding the CA root, improve SSL/TLS
See merge request pleroma/pleroma!4265
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") |