Skip to content
Snippets Groups Projects
Commit 86cef6a9 authored by Erik Johnston's avatar Erik Johnston
Browse files

Allow specifying a directory to host a web client from

parent 571ac105
Branches
Tags
No related merge requests found
...@@ -97,9 +97,11 @@ class SynapseHomeServer(HomeServer): ...@@ -97,9 +97,11 @@ class SynapseHomeServer(HomeServer):
return JsonResource(self) return JsonResource(self)
def build_resource_for_web_client(self): def build_resource_for_web_client(self):
import syweb webclient_path = self.get_config().web_client_location
syweb_path = os.path.dirname(syweb.__file__) if not webclient_path:
webclient_path = os.path.join(syweb_path, "webclient") import syweb
syweb_path = os.path.dirname(syweb.__file__)
webclient_path = os.path.join(syweb_path, "webclient")
# GZip is disabled here due to # GZip is disabled here due to
# https://twistedmatrix.com/trac/ticket/7678 # https://twistedmatrix.com/trac/ticket/7678
# (It can stay enabled for the API resources: they call # (It can stay enabled for the API resources: they call
......
...@@ -22,6 +22,7 @@ class ServerConfig(Config): ...@@ -22,6 +22,7 @@ class ServerConfig(Config):
self.server_name = config["server_name"] self.server_name = config["server_name"]
self.pid_file = self.abspath(config.get("pid_file")) self.pid_file = self.abspath(config.get("pid_file"))
self.web_client = config["web_client"] 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.soft_file_limit = config["soft_file_limit"]
self.daemonize = config.get("daemonize") self.daemonize = config.get("daemonize")
self.print_pidfile = config.get("print_pidfile") self.print_pidfile = config.get("print_pidfile")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment