summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-03-17 12:45:37 +0100
committerDavid Baker <dave@matrix.org>2015-03-17 12:45:37 +0100
commit7564dac8cbb245581c4cba19717f1c30b431059e (patch)
tree0ae1111fd5b502293af037ebef6b77d3cfd52f6f /synapse/config
parentAdd a DistributionMetric to HTTP request/response processing time in the server (diff)
downloadsynapse-7564dac8cbb245581c4cba19717f1c30b431059e.tar.xz
Wire up the webclient option
It existed but was hardcoded to True.
Give it an underscore for consistency.
Also don't pull in syweb unless we're actually using the web client.
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/server.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index b042d4eed9..58a828cc4c 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -28,7 +28,7 @@ class ServerConfig(Config):
         self.unsecure_port = args.unsecure_port
         self.daemonize = args.daemonize
         self.pid_file = self.abspath(args.pid_file)
-        self.webclient = True
+        self.web_client = args.web_client
         self.manhole = args.manhole
         self.soft_file_limit = args.soft_file_limit
 
@@ -68,6 +68,8 @@ class ServerConfig(Config):
         server_group.add_argument('--pid-file', default="homeserver.pid",
                                   help="When running as a daemon, the file to"
                                   " store the pid in")
+        server_group.add_argument('--web_client', default=True, type=bool,
+                                  help="Whether or not to serve a web client")
         server_group.add_argument("--manhole", metavar="PORT", dest="manhole",
                                   type=int,
                                   help="Turn on the twisted telnet manhole"