summary refs log tree commit diff
path: root/synapse/config/cas.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-22 10:37:04 +0100
committerErik Johnston <erik@matrix.org>2015-10-22 10:37:04 +0100
commit5025ba959f2b91919a13d1c3b014487d68c41ad7 (patch)
tree5298473ae753bfc646cc59819e27220763dbadf2 /synapse/config/cas.py
parentReorder changelog (diff)
downloadsynapse-5025ba959f2b91919a13d1c3b014487d68c41ad7.tar.xz
Add config option to disable password login
Diffstat (limited to 'synapse/config/cas.py')
-rw-r--r--synapse/config/cas.py3
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