diff options
| author | Erik Johnston <erik@matrix.org> | 2015-10-23 11:11:56 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-10-23 11:11:56 +0100 |
| commit | 259d10f0e4947f58e70998971b5d862a5ebe17d4 (patch) | |
| tree | 89ecd1b19ed7668d502418e7fbf1310ed68afaba /synapse/config/cas.py | |
| parent | Merge pull request #325 from matrix-org/markjh/filter_dicts (diff) | |
| parent | Fix receipts for room initial sync (diff) | |
| download | synapse-259d10f0e4947f58e70998971b5d862a5ebe17d4.tar.xz | |
Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/config/cas.py')
| -rw-r--r-- | synapse/config/cas.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/cas.py b/synapse/config/cas.py index d268680729..a337ae6ca0 100644 --- a/synapse/config/cas.py +++ b/synapse/config/cas.py @@ -25,7 +25,7 @@ class CasConfig(Config): def read_config(self, config): cas_config = config.get("cas_config", None) if cas_config: - self.cas_enabled = True + self.cas_enabled = cas_config.get("enabled", True) self.cas_server_url = cas_config["server_url"] self.cas_required_attributes = cas_config.get("required_attributes", {}) else: @@ -37,6 +37,7 @@ class CasConfig(Config): return """ # Enable CAS for registration and login. #cas_config: + # enabled: true # server_url: "https://cas-server.com" # #required_attributes: # # name: value |