diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-05-01 14:04:39 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-05-01 14:04:39 +0100 |
| commit | 7b50769eb95e61e9ae85ad46e5a387a64b68a3a7 (patch) | |
| tree | f98784f34d5f0246aee6fcec7fabba20cd8cb27f /synapse/config/homeserver.py | |
| parent | No id field on user (diff) | |
| parent | Allow generate-config to run against an existing config file to generate defa... (diff) | |
| download | synapse-7b50769eb95e61e9ae85ad46e5a387a64b68a3a7.tar.xz | |
Merge pull request #136 from matrix-org/markjh/config_cleanup
Config restructuring.
Diffstat (limited to 'synapse/config/homeserver.py')
| -rw-r--r-- | synapse/config/homeserver.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py index 1c8ff38465..fe0ccb6eb7 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -36,4 +36,6 @@ class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, if __name__ == '__main__': import sys - HomeServerConfig.load_config("Generate config", sys.argv[1:], "HomeServer") + sys.stdout.write( + HomeServerConfig().generate_config(sys.argv[1], sys.argv[2])[0] + ) |