diff options
| author | Cyril Rohr <cyril.rohr@gmail.com> | 2014-04-15 17:57:07 +0100 |
|---|---|---|
| committer | Cyril Rohr <cyril.rohr@gmail.com> | 2014-04-15 19:27:25 +0100 |
| commit | b29171d9ec430c35413335eb6a8cbe83383c46c6 (patch) | |
| tree | 25592691a07e15acf1db04ea58ec9fb665a9ae94 | |
| parent | cad9572ee9f19fa8613833704752250f4b2dc549 (diff) | |
| download | gitlab-ce-b29171d9ec430c35413335eb6a8cbe83383c46c6.tar.gz | |
Allow to specify secret token via 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 |