Codebase list matrix-synapse / 37aa223
Fixup patch Erik Johnston 6 years ago
3 changed file(s) with 32 addition(s) and 22 deletion(s). Raw diff Collapse all Expand all
+0
-21
debian/patches/0005-Honour-config.web_client.patch less more
0 From: Erik Johnston <erikj@matrix.org>
1 Date: Fri, 10 Jun 2016 13:24:51 +0100
2 Subject: Honour config.web_client
3
4 ---
5 synapse/app/homeserver.py | 2 +-
6 1 file changed, 1 insertion(+), 1 deletion(-)
7
8 diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
9 index 5a0329b..492b05f 100755
10 --- a/synapse/app/homeserver.py
11 +++ b/synapse/app/homeserver.py
12 @@ -146,7 +146,7 @@ class SynapseHomeServer(HomeServer):
13 SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self),
14 })
15
16 - if name == "webclient":
17 + if name == "webclient" and config.web_client:
18 resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self)
19
20 if name == "metrics" and self.get_config().enable_metrics:
0 Index: package-synapse-debian/synapse/app/homeserver.py
1 ===================================================================
2 --- package-synapse-debian.orig/synapse/app/homeserver.py
3 +++ package-synapse-debian/synapse/app/homeserver.py
4 @@ -109,7 +109,7 @@ class SynapseHomeServer(HomeServer):
5 for res in listener_config["resources"]:
6 for name in res["names"]:
7 resources.update(self._configure_named_resource(
8 - name, res.get("compress", False),
9 + config, name, res.get("compress", False),
10 ))
11
12 additional_resources = listener_config.get("additional_resources", {})
13 @@ -155,7 +155,7 @@ class SynapseHomeServer(HomeServer):
14 )
15 logger.info("Synapse now listening on port %d", port)
16
17 - def _configure_named_resource(self, name, compress=False):
18 + def _configure_named_resource(self, config, name, compress=False):
19 """Build a resource map for a named resource
20
21 Args:
22 @@ -208,7 +208,7 @@ class SynapseHomeServer(HomeServer):
23 SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self),
24 })
25
26 - if name == "webclient":
27 + if name == "webclient" and config.web_client:
28 resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self)
29
30 if name == "metrics" and self.get_config().enable_metrics:
11 0002-change_instructions.patch
22 0003-saml2.patch
33 0004-webclient-instructions.patch
4 0005-Honour-config.web_client.patch
54 0006-Don-t-require-strict-nacl-0.3.0-requirement.patch
5 remove-webclient.patch