summaryrefslogtreecommitdiff
path: root/config/initializers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-05-15 22:35:59 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-05-15 22:35:59 +0300
commit9e0246684d14e5323cfb71291faff290e2762f48 (patch)
treee9ae0f2613688ad83798ec4ee0e525d6e246b511 /config/initializers
parentced044ad249f794370ea111532a30f81a3c83408 (diff)
downloadgitlab-ce-9e0246684d14e5323cfb71291faff290e2762f48.tar.gz
Files controller handle redirect to remote storage. Added config block to carrierwave init
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/carrierwave.rb20
1 files changed, 11 insertions, 9 deletions
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index 6659c1a1f7c..45bc68f3220 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -5,13 +5,15 @@ aws_file = Rails.root.join('config', 'aws.yml')
if File.exists?(aws_file)
AWS_CONFIG = YAML.load(File.read(aws_file))[Rails.env]
- config.fog_credentials = {
- provider: 'AWS', # required
- aws_access_key_id: AWS_CONFIG['access_key_id'], # required
- aws_secret_access_key: AWS_CONFIG['secret_access_key'], # required
- region: AWS_CONFIG['region'], # optional, defaults to 'us-east-1'
- }
- config.fog_directory = AWS_CONFIG['bucket'] # required
- config.fog_public = false # optional, defaults to true
- config.fog_attributes = {'Cache-Control'=>'max-age=315576000'} # optional, defaults to {}
+ CarrierWave.configure do |config|
+ config.fog_credentials = {
+ provider: 'AWS', # required
+ aws_access_key_id: AWS_CONFIG['access_key_id'], # required
+ aws_secret_access_key: AWS_CONFIG['secret_access_key'], # required
+ region: AWS_CONFIG['region'], # optional, defaults to 'us-east-1'
+ }
+ config.fog_directory = AWS_CONFIG['bucket'] # required
+ config.fog_public = false # optional, defaults to true
+ config.fog_attributes = {'Cache-Control'=>'max-age=315576000'} # optional, defaults to {}
+ end
end