Commit 45503d69 authored by Andrej Shadura's avatar Andrej Shadura

Refresh patches

parent 83e72143
From: Erik Johnston <erikj@matrix.org>
Date: Fri, 10 Jun 2016 10:57:07 +0100
Subject: webclient-instructions
---
synapse/app/homeserver.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -92,12 +92,11 @@
"Please either install the matrix-angular-sdk or configure\n"
"the location of the source to serve via the configuration\n"
"option `web_client_location`\n\n"
- "To install the `matrix-angular-sdk` via pip, run:\n\n"
- " pip install '%(dep)s'\n"
+ "To install the `matrix-angular-sdk` via apt, run:\n\n"
+ " apt install matrix-synapse-angular-client\n"
"\n"
"You can also disable hosting of the webclient via the\n"
"configuration option `web_client`\n"
- % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]}
)
syweb_path = os.path.dirname(syweb.__file__)
webclient_path = os.path.join(syweb_path, "webclient")
......@@ -6,11 +6,9 @@ Subject: Honour config.web_client
synapse/app/homeserver.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 5a0329b..492b05f 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -126,7 +126,7 @@
@@ -95,7 +95,7 @@
for res in listener_config["resources"]:
for name in res["names"]:
resources.update(self._configure_named_resource(
......@@ -19,7 +17,7 @@ index 5a0329b..492b05f 100755
))
additional_resources = listener_config.get("additional_resources", {})
@@ -173,7 +173,7 @@
@@ -145,7 +145,7 @@
)
logger.info("Synapse now listening on port %d", port)
......@@ -28,12 +26,12 @@ index 5a0329b..492b05f 100755
"""Build a resource map for a named resource
Args:
@@ -240,7 +240,7 @@
@@ -209,7 +209,7 @@
if name in ["keys", "federation"]:
resources[SERVER_KEY_V2_PREFIX] = KeyApiV2Resource(self)
- if name == "webclient":
+ if name == "webclient" and config.web_client:
resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self)
webclient_path = self.get_config().web_client_location
if name == "metrics" and self.get_config().enable_metrics:
if webclient_path is None:
......@@ -14,7 +14,7 @@ Bug: https://github.com/matrix-org/synapse/issues/3743
- "To install run:",
- " pip install --upgrade --force \"%s\"" % (e.dependency,),
+ "To install, try:",
+ " sudo apt install python-%s" % (e.dependency,),
+ " sudo apt install python3-%s" % (e.dependency,),
"",
])
sys.stderr.writelines(message)
......@@ -25,7 +25,7 @@ Bug: https://github.com/matrix-org/synapse/issues/3743
Install by running:
- pip install pyjwt
+ sudo apt install python-jwt
+ sudo apt install python3-jwt
"""
)
......@@ -38,7 +38,7 @@ Bug: https://github.com/matrix-org/synapse/issues/3743
- pip install lxml
-
- Requires libxslt1-dev system package.
+ sudo apt install python-lxml
+ sudo apt install python3-lxml
"""
)
0002-change_instructions.patch
0004-webclient-instructions.patch
0005-Honour-config.web_client.patch
0006-Avoid-pip-install.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment