tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Remove vestiges of uploads_path config (#9462)

Browse source 
`uploads_path` was a thing that was never used; most of it was removed in #6628
but a few vestiges remained.
This commit is contained in:
Richard van der Hoff 2021-02-22 19:54:49 +00:00 committed by GitHub
parent 71c9f8de6d
commit 1b2d6d55c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/9462.misc Normal file
View file

@ -0,0 +1 @@
Remove vestiges of `uploads_path` configuration setting.

1
docker/README.md
View file

@ -11,7 +11,6 @@ The image also does *not* provide a TURN server.
By default, the image expects a single volume, located at ``/data``, that will hold: By default, the image expects a single volume, located at ``/data``, that will hold:
* configuration files; * configuration files;
* temporary files during uploads;
* uploaded media and thumbnails; * uploaded media and thumbnails;
* the SQLite database if you do not configure postgres; * the SQLite database if you do not configure postgres;
* the appservices configuration. * the appservices configuration.

1
docker/conf/homeserver.yaml
View file

@ -89,7 +89,6 @@ federation_rc_concurrent: 3
## Files ## ## Files ##
media_store_path: "/data/media" media_store_path: "/data/media"
uploads_path: "/data/uploads"
max_upload_size: "{{ SYNAPSE_MAX_UPLOAD_SIZE or "50M" }}" max_upload_size: "{{ SYNAPSE_MAX_UPLOAD_SIZE or "50M" }}"
max_image_pixels: "32M" max_image_pixels: "32M"
dynamic_thumbnails: false dynamic_thumbnails: false

1
synapse/config/repository.py
View file

@ -206,7 +206,6 @@ class ContentRepositoryConfig(Config):
def generate_config_section(self, data_dir_path, **kwargs): def generate_config_section(self, data_dir_path, **kwargs):
media_store = os.path.join(data_dir_path, "media_store") media_store = os.path.join(data_dir_path, "media_store")
uploads_path = os.path.join(data_dir_path, "uploads")
formatted_thumbnail_sizes = "".join( formatted_thumbnail_sizes = "".join(
THUMBNAIL_SIZE_YAML % s for s in DEFAULT_THUMBNAIL_SIZES THUMBNAIL_SIZE_YAML % s for s in DEFAULT_THUMBNAIL_SIZES

1
tests/utils.py
View file

@ -114,7 +114,6 @@ def default_config(name, parse=False):
"server_name": name, "server_name": name,
"send_federation": False, "send_federation": False,
"media_store_path": "media", "media_store_path": "media",
"uploads_path": "uploads",
# the test signing key is just an arbitrary ed25519 key to keep the config # the test signing key is just an arbitrary ed25519 key to keep the config
# parser happy # parser happy
"signing_key": "ed25519 a_lPym qvioDNmfExFBRPgdTU+wtFYKq4JfwFRv7sYVgWvmgJg", "signing_key": "ed25519 a_lPym qvioDNmfExFBRPgdTU+wtFYKq4JfwFRv7sYVgWvmgJg",