Skip to content

Commit

Permalink
Update doc for setting macaroon_secret_key (matrix-org#13443)
Browse files Browse the repository at this point in the history
* Update doc for setting `macaroon_secret_key`

* newsfile
  • Loading branch information
dklimpel authored and azmeuk committed Aug 8, 2022
1 parent b9606d8 commit 0dfcf1f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
1 change: 1 addition & 0 deletions changelog.d/13443.doc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update documentation for config setting `macaroon_secret_key`.
10 changes: 7 additions & 3 deletions docs/usage/configuration/config_documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -2495,9 +2495,13 @@ track_appservice_user_ips: true
---
### `macaroon_secret_key`

A secret which is used to sign access tokens. If none is specified,
the `registration_shared_secret` is used, if one is given; otherwise,
a secret key is derived from the signing key.
A secret which is used to sign
- access token for guest users,
- short-term login token used during SSO logins (OIDC or SAML2) and
- token used for unsubscribing from email notifications.

If none is specified, the `registration_shared_secret` is used, if one is given;
otherwise, a secret key is derived from the signing key.

Example configuration:
```yaml
Expand Down

0 comments on commit 0dfcf1f

Please sign in to comment.