summary refs log tree commit diff
path: root/debian/patches/0004-webclient-instructions.patch
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-12-11 04:14:34 +1100
committerRichard van der Hoff <richard@matrix.org>2018-12-20 11:15:52 +0000
commitfd4070a85dc4ece77f2427b586c18bb1f4a04197 (patch)
tree2f10f1098e20c3a1c8d44d3bdee6da074665f7b5 /debian/patches/0004-webclient-instructions.patch
parent0.34.0rc2 (diff)
downloadsynapse-fd4070a85dc4ece77f2427b586c18bb1f4a04197.tar.xz
import from package-debian-synapse
Diffstat (limited to 'debian/patches/0004-webclient-instructions.patch')
-rw-r--r--debian/patches/0004-webclient-instructions.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/debian/patches/0004-webclient-instructions.patch b/debian/patches/0004-webclient-instructions.patch
new file mode 100644
index 0000000000..e2e61a8446
--- /dev/null
+++ b/debian/patches/0004-webclient-instructions.patch
@@ -0,0 +1,27 @@
+From: Erik Johnston <erikj@matrix.org>
+Date: Fri, 10 Jun 2016 10:57:07 +0100
+Subject: webclient-instructions
+
+---
+ synapse/app/homeserver.py | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+Index: package-synapse-debian/synapse/app/homeserver.py
+===================================================================
+--- package-synapse-debian.orig/synapse/app/homeserver.py
++++ package-synapse-debian/synapse/app/homeserver.py
+@@ -86,12 +86,11 @@ def build_resource_for_web_client(hs):
+                 "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-get, run:\n\n"
++                "    apt-get 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")