diff options
| author | Matthew Hodgson <matthew@arasphere.net> | 2016-05-10 16:30:05 +0200 |
|---|---|---|
| committer | Matthew Hodgson <matthew@arasphere.net> | 2016-05-10 16:30:05 +0200 |
| commit | fe97b81c0929fd6cc31e8f0eb432e88ca8ccb045 (patch) | |
| tree | 0c771563044691d447ea85cf3e3278ef50c07ea9 /synapse/config/server.py | |
| parent | Merge pull request #763 from matrix-org/erikj/ignore_user (diff) | |
| parent | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs (diff) | |
| download | synapse-fe97b81c0929fd6cc31e8f0eb432e88ca8ccb045.tar.xz | |
Merge pull request #759 from matrix-org/dbkr/email_notifs
Send email notifications for missed messages
Diffstat (limited to 'synapse/config/server.py')
| -rw-r--r-- | synapse/config/server.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 46c633548a..0b5f462e44 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -28,6 +28,11 @@ class ServerConfig(Config): self.print_pidfile = config.get("print_pidfile") self.user_agent_suffix = config.get("user_agent_suffix") self.use_frozen_dicts = config.get("use_frozen_dicts", True) + self.public_baseurl = config.get("public_baseurl") + + if self.public_baseurl is not None: + if self.public_baseurl[-1] != '/': + self.public_baseurl += '/' self.start_pushers = config.get("start_pushers", True) self.listeners = config.get("listeners", []) @@ -143,6 +148,9 @@ class ServerConfig(Config): # Whether to serve a web client from the HTTP/HTTPS root resource. web_client: True + # The public-facing base URL for the client API (not including _matrix/...) + # public_baseurl: https://example.com:8448/ + # Set the soft limit on the number of file descriptors synapse can use # Zero is used to indicate synapse should set the soft limit to the # hard limit. |