summary refs log tree commit diff
path: root/synapse/config/homeserver.py
diff options
context:
space:
mode:
authorMuthu Subramanian <muthu.subramanian.karunanidhi@ericsson.com>2015-07-07 17:40:30 +0530
committerMuthu Subramanian <muthu.subramanian.karunanidhi@ericsson.com>2015-07-08 15:36:54 +0530
commit81682d0f820a6209535267a45ee28b8f66ff7794 (patch)
treef5cda857c38fe8af6291eb58f937f62280232738 /synapse/config/homeserver.py
parentOops: underride rule had an identifier with override in it. (diff)
downloadsynapse-81682d0f820a6209535267a45ee28b8f66ff7794.tar.xz
Integrate SAML2 basic authentication - uses pysaml2
Diffstat (limited to 'synapse/config/homeserver.py')
-rw-r--r--synapse/config/homeserver.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py

index fe0ccb6eb7..5c655c5373 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py
@@ -25,12 +25,12 @@ 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