# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2016-06-24 11:29:27
# Node ID a831f9d8ccccd1e98dca38e2cd746a440b351a68
# Parent  40b447ac4bc6e0af925d464ff45d99cf1d1ed9c4

encryption: allow to pass in alternative key for encryption values

diff --git a/rhodecode/lib/utils2.py b/rhodecode/lib/utils2.py
--- a/rhodecode/lib/utils2.py
+++ b/rhodecode/lib/utils2.py
@@ -343,7 +343,9 @@ def engine_from_config(configuration, pr
 
 
 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,