summary refs log tree commit diff
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2015-03-31 09:22:31 +0100
committerKegan Dougal <kegan@matrix.org>2015-03-31 09:22:31 +0100
commitaf853a4cdb4d6a15a9a249da8bf1aa5be1998aae (patch)
tree54df55b947271a0709645d02bf37f3ee0193971c
parentactually tell users /how/ to turn on registration (diff)
downloadsynapse-af853a4cdb4d6a15a9a249da8bf1aa5be1998aae.tar.xz
Add AppServiceConfig
-rw-r--r--synapse/config/appservice.py31
-rw-r--r--synapse/config/homeserver.py3
2 files changed, 33 insertions, 1 deletions
diff --git a/synapse/config/appservice.py b/synapse/config/appservice.py
new file mode 100644

index 0000000000..399a716d80 --- /dev/null +++ b/synapse/config/appservice.py
@@ -0,0 +1,31 @@ +# Copyright 2015 OpenMarket Ltd +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +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 + + @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." + ) diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py
index 241afdf872..3edfadb98b 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py
@@ -24,12 +24,13 @@ from .email import EmailConfig from .voip import VoipConfig from .registration import RegistrationConfig from .metrics import MetricsConfig +from .appservice import AppServiceConfig class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, RatelimitConfig, ContentRepositoryConfig, CaptchaConfig, EmailConfig, VoipConfig, RegistrationConfig, - MetricsConfig,): + MetricsConfig, AppServiceConfig,): pass