You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by al...@apache.org on 2015/08/24 13:41:36 UTC
[10/50] [abbrv] incubator-taverna-databundle-viewer git commit:
Update config for carrierwave. Use S3 only if key present
Update config for carrierwave. Use S3 only if key present
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/commit/d60689ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/tree/d60689ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/diff/d60689ce
Branch: refs/heads/master
Commit: d60689cee5964eec81f84ee9b1c7cc2807fab3b3
Parents: 77c7825
Author: Denis Karyakin <sa...@gmail.com>
Authored: Wed Aug 5 18:31:17 2015 +0300
Committer: Denis Karyakin <sa...@gmail.com>
Committed: Wed Aug 5 18:31:17 2015 +0300
----------------------------------------------------------------------
config/initializers/carrierwave.rb | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/blob/d60689ce/config/initializers/carrierwave.rb
----------------------------------------------------------------------
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index f3faf0e..99e6649 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -1,20 +1,21 @@
CarrierWave.configure do |config|
# For testing, upload files to local `tmp` folder.
config.storage = :file
+ config.cache_dir = "#{Rails.root}/tmp/uploads" # To let CarrierWave work on heroku
if Rails.env.test?
config.enable_processing = false
config.root = "#{Rails.root}/tmp"
elsif Rails.env.production?
- config.fog_credentials = {
- provider: 'AWS',
- aws_access_key_id: ENV['S3_KEY'],
- aws_secret_access_key: ENV['S3_SECRET'],
- region: ENV['S3_REGION']
- }
- config.storage = :fog
+ if ENV['S3_KEY'].present?
+ config.fog_credentials = {
+ provider: 'AWS',
+ aws_access_key_id: ENV['S3_KEY'],
+ aws_secret_access_key: ENV['S3_SECRET'],
+ region: ENV['S3_REGION']
+ }
+ config.storage = :fog
+ config.fog_directory = ENV['S3_BUCKET_NAME']
+ end
end
-
- config.cache_dir = "#{Rails.root}/tmp/uploads" # To let CarrierWave work on heroku
- config.fog_directory = ENV['S3_BUCKET_NAME']
end