diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2022-06-07 11:53:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-07 10:53:47 +0000 |
| commit | a47636c570c80928af7652d70073496f602511bc (patch) | |
| tree | fe7d7c6471940dbaf73d27e3ace667bcfb2725bd /docs/usage/configuration/config_documentation.md | |
| parent | Remove remaining pieces of groups code. (#12966) (diff) | |
| download | synapse-a47636c570c80928af7652d70073496f602511bc.tar.xz | |
Prevent local quarantined media from being claimed by media retention (#12972)
Diffstat (limited to 'docs/usage/configuration/config_documentation.md')
| -rw-r--r-- | docs/usage/configuration/config_documentation.md | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/usage/configuration/config_documentation.md b/docs/usage/configuration/config_documentation.md index 1c75a23a36..392ae80a75 100644 --- a/docs/usage/configuration/config_documentation.md +++ b/docs/usage/configuration/config_documentation.md @@ -1583,6 +1583,12 @@ been accessed, the media's creation time is used instead. Both thumbnails and the original media will be removed. If either of these options are unset, then media of that type will not be purged. +Local or cached remote media that has been +[quarantined](../../admin_api/media_admin_api.md#quarantining-media-in-a-room) +will not be deleted. Similarly, local media that has been marked as +[protected from quarantine](../../admin_api/media_admin_api.md#protecting-media-from-being-quarantined) +will not be deleted. + Example configuration: ```yaml media_retention: |