diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2021-08-17 14:45:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-17 14:45:24 +0200 |
| commit | 56397599809e131174daaeb4c6dc18fde9db6c3f (patch) | |
| tree | 89143336c80709dcab3834eeae1af9d6de069254 /synapse/rest | |
| parent | Attempt to pull from the legacy spaces summary API over federation. (#10583) (diff) | |
| download | synapse-56397599809e131174daaeb4c6dc18fde9db6c3f.tar.xz | |
Centralise the custom template directory (#10596)
Several configuration sections are using separate settings for custom template directories, which can be confusing. This PR adds a new top-level configuration for a custom template directory which is then used for every module. The only exception is the consent templates, since the consent template directory require a specific hierarchy, so it's probably better that it stays separate from everything else.
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/synapse/client/new_user_consent.py | 2 | ||||
| -rw-r--r-- | synapse/rest/synapse/client/pick_username.py | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/synapse/rest/synapse/client/new_user_consent.py b/synapse/rest/synapse/client/new_user_consent.py index 488b97b32e..fc62a09b7f 100644 --- a/synapse/rest/synapse/client/new_user_consent.py +++ b/synapse/rest/synapse/client/new_user_consent.py @@ -46,6 +46,8 @@ class NewUserConsentResource(DirectServeHtmlResource): self._consent_version = hs.config.consent.user_consent_version def template_search_dirs(): + if hs.config.server.custom_template_directory: + yield hs.config.server.custom_template_directory if hs.config.sso.sso_template_dir: yield hs.config.sso.sso_template_dir yield hs.config.sso.default_template_dir diff --git a/synapse/rest/synapse/client/pick_username.py b/synapse/rest/synapse/client/pick_username.py index ab24ec0a8e..c15b83c387 100644 --- a/synapse/rest/synapse/client/pick_username.py +++ b/synapse/rest/synapse/client/pick_username.py @@ -74,6 +74,8 @@ class AccountDetailsResource(DirectServeHtmlResource): self._sso_handler = hs.get_sso_handler() def template_search_dirs(): + if hs.config.server.custom_template_directory: + yield hs.config.server.custom_template_directory if hs.config.sso.sso_template_dir: yield hs.config.sso.sso_template_dir yield hs.config.sso.default_template_dir |