nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

try accessing env var if present in app_config

Browse source
This commit is contained in:
danielgrippi 2011-08-30 15:03:39 -07:00
parent 57079ef5cd
commit 2f9ea6cd43
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/models/app_config.rb
View file

@ -6,9 +6,7 @@ require 'uri'
class AppConfig < Settingslogic class AppConfig < Settingslogic
def self.source_file_name def self.source_file_name
return ENV.to_hash if ENV["HEROKU"] # Using Heroku if Rails.env == 'test' || ENV["CI"] || Rails.env.include?("integration") || ENV["HEROKU"].present?
if Rails.env == 'test' || ENV["CI"] || Rails.env.include?("integration")
File.join(Rails.root, "config", "application.yml.example") File.join(Rails.root, "config", "application.yml.example")
else else
File.join(Rails.root, "config", "application.yml") File.join(Rails.root, "config", "application.yml")
@ -18,7 +16,7 @@ class AppConfig < Settingslogic
namespace Rails.env namespace Rails.env
def self.load! def self.load!
unless ENV["HEROKU"] unless ENV["HEROKU"].present?
if no_config_file? && !have_old_config_file? if no_config_file? && !have_old_config_file?
$stderr.puts <<-HELP $stderr.puts <<-HELP
******** You haven't set up your Diaspora settings file. ********** ******** You haven't set up your Diaspora settings file. **********
@ -54,7 +52,7 @@ Please do the following:
Process.exit(1) Process.exit(1)
end end
if !ENV["HEROKU"] && no_cert_file_in_prod? if !ENV["HEROKU"].present? && no_cert_file_in_prod?
$stderr.puts <<-HELP $stderr.puts <<-HELP
******** Diaspora does not know where your SSL-CA-Certificates file is. ********** ******** Diaspora does not know where your SSL-CA-Certificates file is. **********
Please add the root certificate bundle (this is operating system specific) to application.yml. Defaults: Please add the root certificate bundle (this is operating system specific) to application.yml. Defaults:
@ -119,6 +117,7 @@ HELP
def self.[] (key) def self.[] (key)
return self.pod_uri if key == :pod_uri return self.pod_uri if key == :pod_uri
return ENV[key.to_s] if ENV[key.to_s].present? && ENV["HEROKU"]
super super
end end