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 /docs | |
| 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 'docs')
| -rw-r--r-- | docs/configuration/cheatsheet.md | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index 0b4e53b6f..6a535e054 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -968,12 +968,13 @@ Pleroma account will be created with the same name as the LDAP user name. * `enabled`: enables LDAP authentication * `host`: LDAP server hostname * `port`: LDAP port, e.g. 389 or 636 -* `ssl`: true to use SSL, usually implies the port 636 +* `ssl`: true to use implicit SSL/TLS, usually port 636 * `sslopts`: additional SSL options -* `tls`: true to start TLS, usually implies the port 389 +* `tls`: true to use explicit TLS (STARTTLS), usually port 389 * `tlsopts`: additional TLS options * `base`: LDAP base, e.g. "dc=example,dc=com" * `uid`: LDAP attribute name to authenticate the user, e.g. when "cn", the filter will be "cn=username,base" +* `cacertfile`: Path to alternate CA root certificates file Note, if your LDAP server is an Active Directory server the correct value is commonly `uid: "cn"`, but if you use an OpenLDAP server the value may be `uid: "uid"`. |