diff options
| author | lain <lain@soykaf.club> | 2020-08-09 10:53:58 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-08-09 10:53:58 +0000 |
| commit | d0fc48ea67d90bf01bd546088b114362592d5eb0 (patch) | |
| tree | c4c56684cbe680fc0c024e028618dc291520bd74 /docs | |
| parent | cb376c4c4ca6491f2b58a9a916986998312640f5 (diff) | |
| parent | ad29a4f2cf4496aaa9463e11d94b35364e9cddae (diff) | |
| download | pleroma-d0fc48ea67d90bf01bd546088b114362592d5eb0.tar.gz | |
Merge branch 'develop' into 'feat/floki-fast-html-2'
# Conflicts:
# config/config.exs
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/administration/CLI_tasks/database.md | 12 | ||||
| -rw-r--r-- | docs/configuration/cheatsheet.md | 6 |
2 files changed, 14 insertions, 4 deletions
diff --git a/docs/administration/CLI_tasks/database.md b/docs/administration/CLI_tasks/database.md index 647f6f274..64dd66c0c 100644 --- a/docs/administration/CLI_tasks/database.md +++ b/docs/administration/CLI_tasks/database.md @@ -97,4 +97,14 @@ but should only be run if necessary. **It is safe to cancel this.** ```sh tab="From Source" mix pleroma.database vacuum full -```
\ No newline at end of file +``` + +## Add expiration to all local statuses + +```sh tab="OTP" +./bin/pleroma_ctl database ensure_expiration +``` + +```sh tab="From Source" +mix pleroma.database ensure_expiration +``` diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index f23cf4fe4..ca587af8e 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -858,9 +858,6 @@ Warning: it's discouraged to use this feature because of the associated security ### :auth -* `Pleroma.Web.Auth.PleromaAuthenticator`: default database authenticator. -* `Pleroma.Web.Auth.LDAPAuthenticator`: LDAP authentication. - Authentication / authorization settings. * `auth_template`: authentication form template. By default it's `show.html` which corresponds to `lib/pleroma/web/templates/o_auth/o_auth/show.html.eex`. @@ -890,6 +887,9 @@ Pleroma account will be created with the same name as the LDAP user name. * `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" +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"`. + ### OAuth consumer mode OAuth consumer mode allows sign in / sign up via external OAuth providers (e.g. Twitter, Facebook, Google, Microsoft, etc.). |