diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-01-03 17:10:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-03 17:10:52 +0000 |
| commit | 98247c4a0e169ee5f201fe5f0e404604d6628566 (patch) | |
| tree | 9d79a768cb366dbcaad4cc2f83ccd1ed01a3a3a0 /synapse/app/homeserver.py | |
| parent | Kill off redundant SynapseRequestFactory (#6619) (diff) | |
| download | synapse-98247c4a0e169ee5f201fe5f0e404604d6628566.tar.xz | |
Remove unused, undocumented "content repo" resource (#6628)
This looks like it got half-killed back in #888. Fixes #6567.
Diffstat (limited to 'synapse/app/homeserver.py')
| -rw-r--r-- | synapse/app/homeserver.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 0e9bf7f53a..6208deb646 100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -39,7 +39,6 @@ import synapse import synapse.config.logger from synapse import events from synapse.api.urls import ( - CONTENT_REPO_PREFIX, FEDERATION_PREFIX, LEGACY_MEDIA_PREFIX, MEDIA_PREFIX, @@ -65,7 +64,6 @@ from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory from synapse.rest import ClientRestResource from synapse.rest.admin import AdminRestResource from synapse.rest.key.v2 import KeyApiV2Resource -from synapse.rest.media.v0.content_repository import ContentRepoResource from synapse.rest.well_known import WellKnownResource from synapse.server import HomeServer from synapse.storage import DataStore @@ -223,13 +221,7 @@ class SynapseHomeServer(HomeServer): if self.get_config().enable_media_repo: media_repo = self.get_media_repository_resource() resources.update( - { - MEDIA_PREFIX: media_repo, - LEGACY_MEDIA_PREFIX: media_repo, - CONTENT_REPO_PREFIX: ContentRepoResource( - self, self.config.uploads_path - ), - } + {MEDIA_PREFIX: media_repo, LEGACY_MEDIA_PREFIX: media_repo} ) elif name == "media": raise ConfigError( |