Merge pull request #6783 from pkgr/allow-secret-token-env

Allow to specify secret token via SECRET_KEY_BASE environment variable.
This commit is contained in:
Sytse Sijbrandij
2014-04-22 13:51:34 +02:00
+3 -1
View File
@@ -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