tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Begin changing the config format

Browse source
This commit is contained in:
Erik Johnston 2015-06-11 15:48:52 +01:00
parent b8690dd840
commit f7f07dc517
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
synapse/config/server.py
View file

@ -61,14 +61,6 @@ class ServerConfig(Config):
# e.g. matrix.org, localhost:8080, etc. # e.g. matrix.org, localhost:8080, etc.
server_name: "%(server_name)s" 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. # Local interface to listen on.
# The empty string will cause synapse to listen on all interfaces. # The empty string will cause synapse to listen on all interfaces.
bind_host: "" bind_host: ""
@ -92,6 +84,30 @@ class ServerConfig(Config):
# This should be disabled if running synapse behind a load balancer # This should be disabled if running synapse behind a load balancer
# that can do automatic compression. # that can do automatic compression.
gzip_responses: True 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() """ % locals()
def read_arguments(self, args): def read_arguments(self, args):