diff options
author | Erik Johnston <erik@matrix.org> | 2015-06-11 15:48:52 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-06-11 15:48:52 +0100 |
commit | f7f07dc517941d628dcb362a7511712728912141 (patch) | |
tree | 49a19cce511f0745a93d666553ab173e0a931cb7 /synapse/config | |
parent | Catch any exceptions in the pusher loop. Use a lower timeout for pushers so w... (diff) | |
download | synapse-f7f07dc517941d628dcb362a7511712728912141.tar.xz |
Begin changing the config format
Diffstat (limited to '')
-rw-r--r-- | synapse/config/server.py | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index d0c8fb8f3c..022ebcea94 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -61,14 +61,6 @@ class ServerConfig(Config): # e.g. matrix.org, localhost:8080, etc. server_name: "%(server_name)s" - # The port to listen for HTTPS requests on. - # For when matrix traffic is sent directly to synapse. - bind_port: %(bind_port)s - - # The port to listen for HTTP requests on. - # For when matrix traffic passes through loadbalancer that unwraps TLS. - unsecure_port: %(unsecure_port)s - # Local interface to listen on. # The empty string will cause synapse to listen on all interfaces. bind_host: "" @@ -92,6 +84,30 @@ class ServerConfig(Config): # This should be disabled if running synapse behind a load balancer # that can do automatic compression. gzip_responses: True + + listeners: + # For when matrix traffic is sent directly to synapse. + secure: + # The type of + type: http_resource + + # The port to listen for HTTPS requests on. + port: %(bind_port)s + + # Is this a TLS socket? + tls: true + + # Local interface to listen on. + # The empty string will cause synapse to listen on all interfaces. + bind_address: "" + + # For when matrix traffic passes through loadbalancer that unwraps TLS. + unsecure: + port: %(unsecure_port)s + tls: false + bind_address: "" + + """ % locals() def read_arguments(self, args): |