diff options
| author | Sytse Sijbrandij <sytses@gmail.com> | 2014-04-22 13:51:34 +0200 |
|---|---|---|
| committer | Sytse Sijbrandij <sytses@gmail.com> | 2014-04-22 13:51:34 +0200 |
| commit | 52a247da5ec279ae2aa2113b9157be36f5eb812f (patch) | |
| tree | d73fda78e3c5ffda1601a002ca57ea193d2baf98 | |
| parent | 1b491c364d07a6764575fa11430f7c7d1ec6ecd1 (diff) | |
| parent | b29171d9ec430c35413335eb6a8cbe83383c46c6 (diff) | |
| download | gitlab-ce-52a247da5ec279ae2aa2113b9157be36f5eb812f.tar.gz | |
Merge pull request #6783 from pkgr/allow-secret-token-env
Allow to specify secret token via SECRET_KEY_BASE environment variable.
| -rw-r--r-- | config/initializers/secret_token.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb index 98400290113..62a54bc8c63 100644 --- a/config/initializers/secret_token.rb +++ b/config/initializers/secret_token.rb @@ -9,7 +9,9 @@ require 'securerandom' def find_secure_token token_file = Rails.root.join('.secret') - if File.exist? token_file + if ENV.key?('SECRET_KEY_BASE') + ENV['SECRET_KEY_BASE'] + elsif File.exist? token_file # Use the existing token. File.read(token_file).chomp else |