diff options
| author | Amber H. Brown <hawkowl@atleastfornow.net> | 2019-08-13 21:53:09 +1000 |
|---|---|---|
| committer | Amber H. Brown <hawkowl@atleastfornow.net> | 2019-08-13 21:53:09 +1000 |
| commit | e5eddea699b95ea979f7d55b7c60b287b7bea11a (patch) | |
| tree | 406a2e1d341c0865663d8d9574c4ab060ceeaddf /docs | |
| parent | initial (diff) | |
| parent | Don't load the media repo when configured to use an external media repo (#5754) (diff) | |
| download | synapse-e5eddea699b95ea979f7d55b7c60b287b7bea11a.tar.xz | |
Merge remote-tracking branch 'origin/develop' into hawkowl/fsb
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/sample_config.yaml | 17 | ||||
| -rw-r--r-- | docs/workers.rst | 7 |
2 files changed, 24 insertions, 0 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index 08316597fa..0c6be30e51 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -565,6 +565,13 @@ log_config: "CONFDIR/SERVERNAME.log.config" +## Media Store ## + +# Enable the media store service in the Synapse master. Uncomment the +# following if you are using a separate media store worker. +# +#enable_media_repo: false + # Directory where uploaded images and attachments are stored. # media_store_path: "DATADIR/media_store" @@ -802,6 +809,16 @@ uploads_path: "DATADIR/uploads" # period: 6w # renew_at: 1w # renew_email_subject: "Renew your %(app)s account" +# # Directory in which Synapse will try to find the HTML files to serve to the +# # user when trying to renew an account. Optional, defaults to +# # synapse/res/templates. +# template_dir: "res/templates" +# # HTML to be displayed to the user after they successfully renewed their +# # account. Optional. +# account_renewed_html_path: "account_renewed.html" +# # HTML to be displayed when the user tries to renew an account with an invalid +# # renewal token. Optional. +# invalid_token_html_path: "invalid_token.html" # Time that a user's session remains valid for, after they log in. # diff --git a/docs/workers.rst b/docs/workers.rst index 7b2d2db533..e11e117418 100644 --- a/docs/workers.rst +++ b/docs/workers.rst @@ -206,6 +206,13 @@ Handles the media repository. It can handle all endpoints starting with:: /_matrix/media/ +And the following regular expressions matching media-specific administration +APIs:: + + ^/_synapse/admin/v1/purge_media_cache$ + ^/_synapse/admin/v1/room/.*/media$ + ^/_synapse/admin/v1/quarantine_media/.*$ + You should also set ``enable_media_repo: False`` in the shared configuration file to stop the main synapse running background jobs related to managing the media repository. |