diff options
author | Mark Haines <mark.haines@matrix.org> | 2016-05-13 16:59:56 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2016-05-13 16:59:56 +0100 |
commit | 1f71f386f68423c00e0d4180ae48b271864b42a5 (patch) | |
tree | 9dd45307ffd592023a8334e90d2c2180f4463225 /synapse/config/key.py | |
parent | Shift some of the state_group methods into the SlavedEventStore (diff) | |
parent | Merge pull request #783 from matrix-org/markjh/slave_account_data (diff) | |
download | synapse-1f71f386f68423c00e0d4180ae48b271864b42a5.tar.xz |
Merge branch 'develop' into dbkr/email_notifs_on_pusher
Diffstat (limited to 'synapse/config/key.py')
-rw-r--r-- | synapse/config/key.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/config/key.py b/synapse/config/key.py index a072aec714..6ee643793e 100644 --- a/synapse/config/key.py +++ b/synapse/config/key.py @@ -57,6 +57,8 @@ class KeyConfig(Config): seed = self.signing_key[0].seed self.macaroon_secret_key = hashlib.sha256(seed) + self.expire_access_token = config.get("expire_access_token", False) + def default_config(self, config_dir_path, server_name, is_generating_file=False, **kwargs): base_key_name = os.path.join(config_dir_path, server_name) @@ -69,6 +71,9 @@ class KeyConfig(Config): return """\ macaroon_secret_key: "%(macaroon_secret_key)s" + # Used to enable access token expiration. + expire_access_token: False + ## Signing Keys ## # Path to the signing key to sign messages with |