diff options
| author | Mark Felder <feld@feld.me> | 2024-09-15 13:56:16 -0400 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2024-09-15 14:00:19 -0400 |
| commit | af3bf8a4628c0b2981d69f624e3be298adc7dfe6 (patch) | |
| tree | 5b83c84b153bc6ce631f1091680963c14b39356e /docs | |
| parent | 5539fea3bb0d272b4cefc2b72755cb3cd285cc67 (diff) | |
| download | pleroma-af3bf8a4628c0b2981d69f624e3be298adc7dfe6.tar.gz pleroma-af3bf8a4628c0b2981d69f624e3be298adc7dfe6.zip | |
Support implicit TLS connections
Update docs to clarify that the :ssl option is also for modern TLS, but the :tls option is only for STARTTLS
These options may benefit from being renamed but they match upstream terminology.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/configuration/cheatsheet.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index 4cbde696e..6a535e054 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -968,9 +968,9 @@ 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" |