diff options
| -rw-r--r-- | config/initializers/paperclip.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index 68559fe01..cb7ed4487 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -4,7 +4,7 @@ if ENV['S3_ENABLED'] == 'true' Aws.eager_autoload!(services: %w(S3)) Paperclip::Attachment.default_options[:storage] = :s3 - Paperclip::Attachment.default_options[:s3_protocol] = ':https' + Paperclip::Attachment.default_options[:s3_protocol] = 'https' Paperclip::Attachment.default_options[:url] = ':s3_domain_url' Paperclip::Attachment.default_options[:s3_host_name] = ENV.fetch('S3_HOSTNAME') { "s3-#{ENV.fetch('S3_REGION')}.amazonaws.com" } Paperclip::Attachment.default_options[:path] = '/:class/:attachment/:id_partition/:style/:filename' @@ -12,11 +12,6 @@ if ENV['S3_ENABLED'] == 'true' Paperclip::Attachment.default_options[:s3_permissions] = 'public' Paperclip::Attachment.default_options[:s3_region] = ENV.fetch('S3_REGION') { 'us-east-1' } - unless ENV['S3_CLOUDFRONT_HOST'].blank? - Paperclip::Attachment.default_options[:url] = ':s3_alias_url' - Paperclip::Attachment.default_options[:s3_host_alias] = ENV['S3_CLOUDFRONT_HOST'] - end - Paperclip::Attachment.default_options[:s3_credentials] = { bucket: ENV.fetch('S3_BUCKET'), access_key_id: ENV.fetch('AWS_ACCESS_KEY_ID'), @@ -31,4 +26,9 @@ if ENV['S3_ENABLED'] == 'true' Paperclip::Attachment.default_options[:url] = ':s3_path_url' end + + unless ENV['S3_CLOUDFRONT_HOST'].blank? + Paperclip::Attachment.default_options[:url] = ':s3_alias_url' + Paperclip::Attachment.default_options[:s3_host_alias] = ENV['S3_CLOUDFRONT_HOST'] + end end |