summary refs log tree commit diff
path: root/synapse/config/server.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-04-27 15:46:40 +0100
committerGitHub <noreply@github.com>2017-04-27 15:46:40 +0100
commitbb9246e52529ee0055a8b756eadb0d2c83b80607 (patch)
tree0c6db56e64e72d3152818421e2b4e059233c6c3a /synapse/config/server.py
parentFix bgupdate error if index already exists (#2167) (diff)
parentQueried CONDITIONAL_REQUIREMENTS (diff)
downloadsynapse-bb9246e52529ee0055a8b756eadb0d2c83b80607.tar.xz
Merge pull request #2131 from matthewjwolff/develop
web_client_location documentation fix
Diffstat (limited to '')
-rw-r--r--synapse/config/server.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py

index 1f9999d57a..25e6666238 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py
@@ -144,6 +144,12 @@ class ServerConfig(Config): # Whether to serve a web client from the HTTP/HTTPS root resource. web_client: True + # The root directory to server for the above web client. + # If left undefined, synapse will serve the matrix-angular-sdk web client. + # Make sure matrix-angular-sdk is installed with pip if web_client is True + # and web_client_location is undefined + # web_client_location: "/path/to/web/root" + # The public-facing base URL for the client API (not including _matrix/...) # public_baseurl: https://example.com:8448/