Allow multiple config files, set up a default config before applying the config files

This commit is contained in:
Mark Haines 2015-04-30 13:48:15 +01:00
parent 6b69ddd17a
commit 1aa11cf7ce
3 changed files with 40 additions and 23 deletions

View file

@ -37,5 +37,5 @@ class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig,
if __name__ == '__main__':
import sys
sys.stdout.write(
HomeServerConfig().generate_config(sys.argv[1], sys.argv[2])
HomeServerConfig().generate_config(sys.argv[1], sys.argv[2])[0]
)