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/saml2.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 '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) |