summary refs log tree commit diff
path: root/synapse/config/homeserver.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-10 12:18:33 +0100
committerErik Johnston <erik@matrix.org>2015-10-10 12:18:33 +0100
commit347aa3c2252dca5cd7a50ebc0a7e87f33bc7a4b4 (patch)
treeff02cde7b776bf05794bd7671007956606274382 /synapse/config/homeserver.py
parentMerge pull request #294 from matrix-org/markjh/initial_sync_archived_flag (diff)
parentRaise LoginError if CasResponse doensn't contain user (diff)
downloadsynapse-347aa3c2252dca5cd7a50ebc0a7e87f33bc7a4b4.tar.xz
Merge pull request #295 from stevenhammerton/sh-cas-auth
Provide ability to login using CAS
Diffstat (limited to 'synapse/config/homeserver.py')
-rw-r--r--synapse/config/homeserver.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py

index d77f045406..3039f3c0bf 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py
@@ -26,12 +26,13 @@ from .metrics import MetricsConfig from .appservice import AppServiceConfig from .key import KeyConfig from .saml2 import SAML2Config +from .cas import CasConfig class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, RatelimitConfig, ContentRepositoryConfig, CaptchaConfig, VoipConfig, RegistrationConfig, MetricsConfig, - AppServiceConfig, KeyConfig, SAML2Config, ): + AppServiceConfig, KeyConfig, SAML2Config, CasConfig): pass