From 4691285989000a8053c9540fa50ca95d3a00551d Mon Sep 17 00:00:00 2001 From: Cyril Rohr Date: Tue, 15 Apr 2014 17:04:22 +0100 Subject: Allow to overwrite location of gitlab.yml config file. --- config/initializers/1_settings.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 59564d9ea33..4e8b3f304d0 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -1,5 +1,5 @@ class Settings < Settingslogic - source "#{Rails.root}/config/gitlab.yml" + source ENV.fetch('GITLAB_CONFIG') { "#{Rails.root}/config/gitlab.yml" } namespace Rails.env class << self -- cgit v1.2.1 From b29171d9ec430c35413335eb6a8cbe83383c46c6 Mon Sep 17 00:00:00 2001 From: Cyril Rohr Date: Tue, 15 Apr 2014 17:57:07 +0100 Subject: Allow to specify secret token via environment variable. --- config/initializers/secret_token.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1