Skip to content

Commit

Permalink
Comments correction after review (matrix-org#2752)
Browse files Browse the repository at this point in the history
  • Loading branch information
srdjan-catalyst committed Aug 29, 2021
1 parent b1dfb90 commit 323db7a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
8 changes: 4 additions & 4 deletions docs/sample_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2609,10 +2609,10 @@ redis:

## Oembed ##

# Providers json files directory
oembed_providers_dir: /etc/matrix-synapse/oembed/

# Providers json files directory.
# oembed directory contains https://oembed.com/providers.json file
# that you can place in oembed_providers_dir. Deb package does that for you.
# Other custom providers could be added in other .json files, following the
# Other custom providers can be added in other .json files, following the
# same json format.
#
oembed_providers_dir: /etc/matrix-synapse/oembed/
8 changes: 4 additions & 4 deletions synapse/config/oembed.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,13 @@ def generate_config_section(self, config_dir_path, server_name, **kwargs):
return """\
## Oembed ##
# Providers json files directory
oembed_providers_dir: /etc/matrix-synapse/oembed/
# Providers json files directory.
# oembed directory contains https://oembed.com/providers.json file
# that you can place in oembed_providers_dir. Deb package does that for you.
# Other custom providers could be added in other .json files, following the
# Other custom providers can be added in other .json files, following the
# same json format.
#
oembed_providers_dir: /etc/matrix-synapse/oembed/
"""


Expand Down
1 change: 0 additions & 1 deletion tests/rest/media/v1/test_url_preview.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ def make_homeserver(self, reactor, clock):

config["media_storage_providers"] = [provider_config]

# Route the HTTP version to an HTTP endpoint so that the tests work.
config["oembed_providers_dir"] = os.path.join(os.environ["TOP"], "oembed")

hs = self.setup_test_homeserver(config=config)
Expand Down

0 comments on commit 323db7a

Please sign in to comment.