summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-13 13:50:01 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-13 13:50:01 +0100
commit7f40fa1d4601960e8c1ea39af26a3e7515ff0f3e (patch)
tree759a6669ff412bc27b3ea57871e4a14fa418106e /synapse/app
parentMerge branch 'master' of github.com:matrix-org/synapse (diff)
downloadsynapse-7f40fa1d4601960e8c1ea39af26a3e7515ff0f3e.tar.xz
Added a -w flag which will host the web client if specified. Currently this just delegates to the webclient RestServlet.
Diffstat (limited to 'synapse/app')
-rw-r--r--synapse/app/homeserver.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 9ad8ac7f0e..dcf0b5f287 100644
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -126,6 +126,8 @@ def setup():
     parser.add_argument('--pid-file', dest="pid", help="When running as a "
                         "daemon, the file to store the pid in",
                         default="hs.pid")
+    parser.add_argument("-w", "--webclient", dest="webclient",
+                        action="store_true", help="Host the web client.")
     args = parser.parse_args()
 
     verbosity = int(args.verbose) if args.verbose else None
@@ -147,7 +149,7 @@ def setup():
     # the replication layer
     hs.get_federation()
 
-    hs.register_servlets()
+    hs.register_servlets(host_web_client=args.webclient)
 
     hs.get_http_server().start_listening(args.port)