diff options
| author | Erik Johnston <erik@matrix.org> | 2015-07-10 10:25:56 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-07-10 10:25:56 +0100 |
| commit | 9158ad1abb8da17a0f463b15e584eb264cb58250 (patch) | |
| tree | c835aa4d875cb6fcd493e76edfd2a10cbf4b4e4a /synapse/config/homeserver.py | |
| parent | We don't want semicolons. (diff) | |
| parent | Make SAML2 optional and add some references/comments (diff) | |
| download | synapse-9158ad1abb8da17a0f463b15e584eb264cb58250.tar.xz | |
Merge pull request #201 from EricssonResearch/msba/saml2-develop
Integrate SAML2 basic authentication - uses pysaml2
Diffstat (limited to 'synapse/config/homeserver.py')
| -rw-r--r-- | synapse/config/homeserver.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py index fe0ccb6eb7..d77f045406 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -25,12 +25,13 @@ from .registration import RegistrationConfig from .metrics import MetricsConfig from .appservice import AppServiceConfig from .key import KeyConfig +from .saml2 import SAML2Config class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, RatelimitConfig, ContentRepositoryConfig, CaptchaConfig, - VoipConfig, RegistrationConfig, - MetricsConfig, AppServiceConfig, KeyConfig,): + VoipConfig, RegistrationConfig, MetricsConfig, + AppServiceConfig, KeyConfig, SAML2Config, ): pass |