diff --git a/book/changelog.md b/book/changelog.md index e303dc56..43928b1b 100644 --- a/book/changelog.md +++ b/book/changelog.md @@ -139,7 +139,7 @@ This will be the first release of Grapevine since it was forked from Conduit thumbnail request fails. ([!58](https://gitlab.computer.surgery/matrix/grapevine/-/merge_requests/58)) 11. **BREAKING:** Disable unauthenticated access to media by default. Use - `media.serve_media_unauthenticated` to configure this behavior. + `media.allow_unauthenticated_access` to configure this behavior. ([!103](https://gitlab.computer.surgery/matrix/grapevine/-/merge_requests/103), [!140](https://gitlab.computer.surgery/matrix/grapevine/-/merge_requests/140)) 12. **BREAKING:** Split CLI into multiple subcommands. The CLI invocation to run diff --git a/src/cli/serve.rs b/src/cli/serve.rs index 4660dc5c..bac85e48 100644 --- a/src/cli/serve.rs +++ b/src/cli/serve.rs @@ -443,7 +443,7 @@ fn legacy_media_routes(config: &Config) -> Router { // deprecated, but unproblematic let router = router.ruma_route(c2s::get_media_config_legacy_route); - if config.media.serve_media_unauthenticated { + if config.media.allow_unauthenticated_access { router .ruma_route(c2s::get_content_legacy_route) .ruma_route(c2s::get_content_as_filename_legacy_route) diff --git a/src/config.rs b/src/config.rs index b0f1aec7..b904a903 100644 --- a/src/config.rs +++ b/src/config.rs @@ -78,7 +78,7 @@ pub(crate) struct Config { #[serde(deny_unknown_fields)] pub(crate) struct MediaConfig { #[serde(default)] - pub(crate) serve_media_unauthenticated: bool, + pub(crate) allow_unauthenticated_access: bool, } #[derive(Debug, Deserialize)]