diff options
author | Erik Johnston <erik@matrix.org> | 2015-10-22 10:37:04 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-10-22 10:37:04 +0100 |
commit | 5025ba959f2b91919a13d1c3b014487d68c41ad7 (patch) | |
tree | 5298473ae753bfc646cc59819e27220763dbadf2 /synapse/config/saml2.py | |
parent | Reorder changelog (diff) | |
download | synapse-5025ba959f2b91919a13d1c3b014487d68c41ad7.tar.xz |
Add config option to disable password login
Diffstat (limited to 'synapse/config/saml2.py')
-rw-r--r-- | synapse/config/saml2.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/saml2.py b/synapse/config/saml2.py index 4c6133cf22..8d7f443021 100644 --- a/synapse/config/saml2.py +++ b/synapse/config/saml2.py @@ -33,7 +33,7 @@ class SAML2Config(Config): def read_config(self, config): saml2_config = config.get("saml2_config", None) if saml2_config: - self.saml2_enabled = True + self.saml2_enabled = saml2_config.get("enabled", True) self.saml2_config_path = saml2_config["config_path"] self.saml2_idp_redirect_url = saml2_config["idp_redirect_url"] else: @@ -49,6 +49,7 @@ class SAML2Config(Config): # the user back to /login/saml2 with proper info. # See pysaml2 docs for format of config. #saml2_config: + # enabled: true # config_path: "%s/sp_conf.py" # idp_redirect_url: "http://%s/idp" """ % (config_dir_path, server_name) |