Skip to content

Commit 0dfcf1f

Browse files
dklimpelazmeuk
authored andcommitted
Update doc for setting macaroon_secret_key (matrix-org#13443)
* Update doc for setting `macaroon_secret_key` * newsfile
1 parent b9606d8 commit 0dfcf1f

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

changelog.d/13443.doc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update documentation for config setting `macaroon_secret_key`.

docs/usage/configuration/config_documentation.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2495,9 +2495,13 @@ track_appservice_user_ips: true
24952495
---
24962496
### `macaroon_secret_key`
24972497

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

25022506
Example configuration:
25032507
```yaml

0 commit comments

Comments
 (0)