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

Merge branch 'develop' into key_distribution

Browse source 
Conflicts:
	synapse/config/homeserver.py
This commit is contained in:
Mark Haines 2015-04-29 13:15:14 +01:00
commit 4ad8b45155
115 changed files with 4445 additions and 1137 deletions
Download patch file Download diff file Expand all files Collapse all files

7
synapse/config/_base.py
View file

@ -158,9 +158,10 @@ class Config(object):
and value is not None):
config[key] = value
with open(config_args.config_path, "w") as config_file:
# TODO(paul) it would be lovely if we wrote out vim- and emacs-
# style mode markers into the file, to hint to people that
# this is a YAML file.
# TODO(mark/paul) We might want to output emacs-style mode
# markers as well as vim-style mode markers into the file,
# to further hint to people this is a YAML file.
config_file.write("# vim:ft=yaml\n")
yaml.dump(config, config_file, default_flow_style=False)
print (
"A config file has been generated in %s for server name"