diff --git a/Gemfile b/Gemfile index f75e86c8f..2955ee22b 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ gem 'sidekiq', '2.10.0' # Configuration -gem 'configurate', '0.0.2' +gem 'configurate', '0.0.6' # Cross-origin resource sharing diff --git a/Gemfile.lock b/Gemfile.lock index 7c0586432..80c3a5a11 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -76,7 +76,7 @@ GEM sass (~> 3.1) compass-rails (1.0.3) compass (>= 0.12.2, < 0.14) - configurate (0.0.2) + configurate (0.0.6) connection_pool (1.0.0) crack (0.3.2) cucumber (1.2.5) @@ -419,7 +419,7 @@ DEPENDENCIES carrierwave (= 0.8.0) client_side_validations (= 3.2.5) compass-rails (= 1.0.3) - configurate (= 0.0.2) + configurate (= 0.0.6) cucumber-rails (= 1.3.1) database_cleaner (= 0.9.1) devise (= 2.1.3) diff --git a/config/load_config.rb b/config/load_config.rb index 46102cd76..e9fa0d92a 100644 --- a/config/load_config.rb +++ b/config/load_config.rb @@ -40,7 +40,7 @@ AppConfig ||= Configurate::Settings.create do extend Configuration::Methods -if rails_env == "production" && + if rails_env == "production" && (environment.certificate_authorities.nil? || environment.certificate_authorities.empty? || !File.file?(environment.certificate_authorities.get))