diff options
| author | Erik Johnston <erik@matrix.org> | 2015-10-28 17:53:24 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-10-28 17:53:24 +0000 |
| commit | 2f6ad79a80a167b094e4ecd1894bae9b1cd15675 (patch) | |
| tree | ea04c29e90a9335f6a4bfa199e9f4b4adfdc9ded /synapse/config/cas.py | |
| parent | Pull out sender when computing search results (diff) | |
| parent | Docs (diff) | |
| download | synapse-2f6ad79a80a167b094e4ecd1894bae9b1cd15675.tar.xz | |
Merge branch 'erikj/context_api' into erikj/search
Diffstat (limited to '')
| -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 |