Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-11-13 13:20:38 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into request_logging

Browse source 
Conflicts:
	setup.py
	synapse/storage/_base.py
	synapse/util/async.py
This commit is contained in:
Mark Haines 2014-11-14 11:16:50 +00:00
commit e903c941cb
208 changed files with 8887 additions and 19461 deletions
Download patch file Download diff file Expand all files Collapse all files

3
synapse/config/server.py
View file

@ -30,6 +30,7 @@ class ServerConfig(Config):
self.pid_file = self.abspath(args.pid_file)
self.webclient = True
self.manhole = args.manhole
self.no_tls = args.no_tls
if not args.content_addr:
host = args.server_name
@ -67,6 +68,8 @@ class ServerConfig(Config):
server_group.add_argument("--content-addr", default=None,
help="The host and scheme to use for the "
"content repository")
server_group.add_argument("--no-tls", action='store_true',
help="Don't bind to the https port.")
def read_signing_key(self, signing_key_path):
signing_keys = self.read_file(signing_key_path, "signing_key")