summary refs log tree commit diff
path: root/synapse/config/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-03-20 16:31:48 +0000
committerErik Johnston <erik@matrix.org>2015-03-20 16:31:48 +0000
commitf6583796feeff5a50c0988ce674a1ab861b14e34 (patch)
tree47f9d5934440eef201c6ab65a0fb8df06631d18d /synapse/config/server.py
parentRearrange storage modules (diff)
parentMerge pull request #113 from matrix-org/store_rearrangement (diff)
downloadsynapse-f6583796feeff5a50c0988ce674a1ab861b14e34.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into mysql
Diffstat (limited to 'synapse/config/server.py')
-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"