From 858cf0db779f57343bbd48edf851131aeaa42510 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Fri, 24 Jun 2016 13:29:27 +0200 Subject: [PATCH] encryption: allow to pass in alternative key for encryption values --- rhodecode/lib/utils2.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rhodecode/lib/utils2.py b/rhodecode/lib/utils2.py index 59bbb5a7..217adf42 100644 --- a/rhodecode/lib/utils2.py +++ b/rhodecode/lib/utils2.py @@ -343,7 +343,9 @@ def engine_from_config(configuration, prefix='sqlalchemy.', **kwargs): def get_encryption_key(config): - return config['beaker.session.secret'] + secret = config.get('rhodecode.encrypted_values.secret') + default = config['beaker.session.secret'] + return secret or default def age(prevdate, now=None, show_short_version=False, show_suffix=True,