From 2fcf729f64af545a01e587caeeadda1234d47c44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 8 Dec 2012 00:50:30 +0100 Subject: [PATCH] don't use a rails method in a pre-rails environment --- config/load_config.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/load_config.rb b/config/load_config.rb index 9faff8cd9..46102cd76 100644 --- a/config/load_config.rb +++ b/config/load_config.rb @@ -40,7 +40,10 @@ AppConfig ||= Configurate::Settings.create do extend Configuration::Methods - if rails_env == "production" && (environment.certificate_authorities.blank? || !File.file?(environment.certificate_authorities.get)) +if rails_env == "production" && + (environment.certificate_authorities.nil? || + environment.certificate_authorities.empty? || + !File.file?(environment.certificate_authorities.get)) $stderr.puts "FATAL: Diaspora doesn't know where your certificate authorities are. Please ensure they are set to a valid path in diaspora.yml" Process.exit(1) end