swcs/9minutes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed settings for the env variables

Browse Source
This commit is contained in:
Thomas Buchöster
2011-07-07 09:39:23 +02:00
committed by Thomas Buchöster
parent e0226b4cc0
commit 3a033eeec2
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/initializers/app_config.rb
+11 -3
View File
@@ -1,4 +1,12 @@
APP_CONFIG = HashWithIndifferentAccess.new(YAML.load(File.open(File.join(Rails.root, 'config', 'config.yml'))))
APP_CONFIG.each do |key, value|
ENV[key] = value
if Rails.env !=~ /production/
APP_CONFIG = HashWithIndifferentAccess.new(YAML.load(File.open(File.join(Rails.root, 'config', 'config.yml'))))
APP_CONFIG.each do |key, value|
if value.is_a?(Hash)
value.each do |k,v|
ENV["#{key}_#{k}"] = v
end
else
ENV[key] = value
end
end
end
config/initializers/devise.rb
+2 -2
View File
@@ -185,10 +185,10 @@ Devise.setup do |config|
# Facebook-Setting for Heroku
if Rails.env =~ /production/
config.omniauth :facebook, ENV['facebook']['app_id'], ENV['facebook']['secret']
config.omniauth :facebook, ENV['facebook_app_id'], ENV['facebook_secret']
{:scope => 'email, offline_access', :client_options => {:ssl => {:ca_file => '/usr/lib/ssl/certs/ca-certificates.crt'}}}
else
config.omniauth :facebook, ENV['facebook']['app_id'], ENV['facebook']['secret']
config.omniauth :facebook, ENV['facebook_app_id'], ENV['facebook_secret']
end
config.omniauth :open_id, OpenID::Store::Filesystem.new('/tmp')