diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2021-10-06 10:47:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-06 10:47:41 -0400 |
| commit | f4b1a9a527273ef71b2f7d970642b7af45462e0f (patch) | |
| tree | 84e54115c048d408a8f110e62f503b03e4c11ad1 /synapse/rest/client | |
| parent | Add a spamchecker callback to allow or deny room joins (#10910) (diff) | |
| download | synapse-f4b1a9a527273ef71b2f7d970642b7af45462e0f.tar.xz | |
Require direct references to configuration variables. (#10985)
This removes the magic allowing accessing configurable variables directly from the config object. It is now required that a specific configuration class is used (e.g. `config.foo` must be replaced with `config.server.foo`).
Diffstat (limited to 'synapse/rest/client')
| -rw-r--r-- | synapse/rest/client/auth.py | 2 | ||||
| -rw-r--r-- | synapse/rest/client/push_rule.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/synapse/rest/client/auth.py b/synapse/rest/client/auth.py index c9ad35a3ad..9c15a04338 100644 --- a/synapse/rest/client/auth.py +++ b/synapse/rest/client/auth.py @@ -48,7 +48,7 @@ class AuthRestServlet(RestServlet): self.auth_handler = hs.get_auth_handler() self.registration_handler = hs.get_registration_handler() self.recaptcha_template = hs.config.captcha.recaptcha_template - self.terms_template = hs.config.terms_template + self.terms_template = hs.config.consent.terms_template self.registration_token_template = ( hs.config.registration.registration_token_template ) diff --git a/synapse/rest/client/push_rule.py b/synapse/rest/client/push_rule.py index ecebc46e8d..6f796d5e50 100644 --- a/synapse/rest/client/push_rule.py +++ b/synapse/rest/client/push_rule.py @@ -61,7 +61,9 @@ class PushRuleRestServlet(RestServlet): self.notifier = hs.get_notifier() self._is_worker = hs.config.worker.worker_app is not None - self._users_new_default_push_rules = hs.config.users_new_default_push_rules + self._users_new_default_push_rules = ( + hs.config.server.users_new_default_push_rules + ) async def on_PUT(self, request: SynapseRequest, path: str) -> Tuple[int, JsonDict]: if self._is_worker: |