From ba1b3a91b9623fe56d0ce462bd683e5cdcb89515 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 18 Aug 2020 09:16:45 +0100 Subject: [PATCH 1/3] Add resources.consent conditional dependency back Turns out that part of the codebase (synapse.config.server) checks for this key explicitly. Rather than remove that check, we're re-adding the option now in case anything else may break. --- synapse/python_dependencies.py | 1 + 1 file changed, 1 insertion(+) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 3250d41ddea9..1a20c19bec3e 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -78,6 +78,7 @@ "matrix-synapse-ldap3": ["matrix-synapse-ldap3>=0.1"], # we use execute_batch, which arrived in psycopg 2.7. "postgres": ["psycopg2>=2.7"], + "resources.consent": [], # ACME support is required to provision TLS certificates from authorities # that use the protocol, such as Let's Encrypt. "acme": [ From 329b2e7d611b60d9af7cc8be96e04d8c5666e3f7 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 18 Aug 2020 09:19:43 +0100 Subject: [PATCH 2/3] Add changelog --- changelog.d/8107.feature | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/8107.feature diff --git a/changelog.d/8107.feature b/changelog.d/8107.feature new file mode 100644 index 000000000000..2e5127477d5a --- /dev/null +++ b/changelog.d/8107.feature @@ -0,0 +1 @@ +Use the default template file when its equivalent is not found in a custom template directory. \ No newline at end of file From b7b62ccb1244ce4969f4d89d910659a00b3680b6 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 18 Aug 2020 10:38:26 +0100 Subject: [PATCH 3/3] Remove resources.consent and all checking code --- synapse/config/server.py | 20 -------------------- synapse/python_dependencies.py | 1 - 2 files changed, 21 deletions(-) diff --git a/synapse/config/server.py b/synapse/config/server.py index 9f15ed109e18..ed66f3eba19f 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -26,7 +26,6 @@ from synapse.api.room_versions import KNOWN_ROOM_VERSIONS from synapse.http.endpoint import parse_and_validate_server_name -from synapse.python_dependencies import DependencyException, check_requirements from ._base import Config, ConfigError @@ -508,8 +507,6 @@ class LimitRemoteRoomsConfig(object): ) ) - _check_resource_config(self.listeners) - self.cleanup_extremities_with_dummy_events = config.get( "cleanup_extremities_with_dummy_events", True ) @@ -1133,20 +1130,3 @@ def _warn_if_webclient_configured(listeners: Iterable[ListenerConfig]) -> None: if name == "webclient": logger.warning(NO_MORE_WEB_CLIENT_WARNING) return - - -def _check_resource_config(listeners: Iterable[ListenerConfig]) -> None: - resource_names = { - res_name - for listener in listeners - if listener.http_options - for res in listener.http_options.resources - for res_name in res.names - } - - for resource in resource_names: - if resource == "consent": - try: - check_requirements("resources.consent") - except DependencyException as e: - raise ConfigError(e.message) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 1a20c19bec3e..3250d41ddea9 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -78,7 +78,6 @@ "matrix-synapse-ldap3": ["matrix-synapse-ldap3>=0.1"], # we use execute_batch, which arrived in psycopg 2.7. "postgres": ["psycopg2>=2.7"], - "resources.consent": [], # ACME support is required to provision TLS certificates from authorities # that use the protocol, such as Let's Encrypt. "acme": [