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/appservice.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/appservice.py')
| -rw-r--r-- | synapse/config/appservice.py | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/synapse/config/appservice.py b/synapse/config/appservice.py index 399a716d80..38f41933b7 100644 --- a/synapse/config/appservice.py +++ b/synapse/config/appservice.py @@ -17,15 +17,11 @@ from ._base import Config class AppServiceConfig(Config): - def __init__(self, args): - super(AppServiceConfig, self).__init__(args) - self.app_service_config_files = args.app_service_config_files + def read_config(self, config): + self.app_service_config_files = config.get("app_service_config_files", []) - @classmethod - def add_arguments(cls, parser): - super(AppServiceConfig, cls).add_arguments(parser) - group = parser.add_argument_group("appservice") - group.add_argument( - "--app-service-config-files", type=str, nargs='+', - help="A list of application service config files to use." - ) + def default_config(cls, config_dir_path, server_name): + return """\ + # A list of application service config file to use + app_service_config_files: [] + """ |