diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-06-15 16:37:08 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-06-15 16:37:08 +0100 |
| commit | c2b4621630d982a38585c177d7c960c5127620bf (patch) | |
| tree | 8fdd440785ed56531c36e0f34e65fe139e6ce541 /synapse/config/saml2_config.py | |
| parent | Incorporate review (diff) | |
| parent | Remove "user_id" from GET /presence. (#7606) (diff) | |
| download | synapse-c2b4621630d982a38585c177d7c960c5127620bf.tar.xz | |
Merge branch 'develop' into babolivier/mark_unread
Diffstat (limited to 'synapse/config/saml2_config.py')
| -rw-r--r-- | synapse/config/saml2_config.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/config/saml2_config.py b/synapse/config/saml2_config.py index d0a19751e8..293643b2de 100644 --- a/synapse/config/saml2_config.py +++ b/synapse/config/saml2_config.py @@ -160,7 +160,7 @@ class SAML2Config(Config): # session lifetime: in milliseconds self.saml2_session_lifetime = self.parse_duration( - saml2_config.get("saml_session_lifetime", "5m") + saml2_config.get("saml_session_lifetime", "15m") ) template_dir = saml2_config.get("template_dir") @@ -286,7 +286,7 @@ class SAML2Config(Config): # The lifetime of a SAML session. This defines how long a user has to # complete the authentication process, if allow_unsolicited is unset. - # The default is 5 minutes. + # The default is 15 minutes. # #saml_session_lifetime: 5m |