summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-25 15:50:25 +0100
committerErik Johnston <erik@matrix.org>2015-08-25 15:50:25 +0100
commit747535f20f9bb73bfcb2ca08ea5c57e2bcefe3c0 (patch)
tree652bd365f681c631b20d3116c9e558e4444ade62 /synapse/config
parentMerge pull request #246 from matrix-org/erikj/config_helper_function (diff)
parentPrint the correct pip install line when failing due to lack of matrix-angular... (diff)
downloadsynapse-747535f20f9bb73bfcb2ca08ea5c57e2bcefe3c0.tar.xz
Merge pull request #245 from matrix-org/erikj/configurable_client_location
Allow specifying a directory to host a web client from
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/server.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index f9a3b5f15b..a03e55c223 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -22,6 +22,7 @@ class ServerConfig(Config):
         self.server_name = config["server_name"]
         self.pid_file = self.abspath(config.get("pid_file"))
         self.web_client = config["web_client"]
+        self.web_client_location = config.get("web_client_location", None)
         self.soft_file_limit = config["soft_file_limit"]
         self.daemonize = config.get("daemonize")
         self.print_pidfile = config.get("print_pidfile")