Browse Source

Merge pull request #676 from leopku/feature/s3_protocol_from_env

🔧 S3 protocol  from ENV
closed-social-glitch-2
Eugen 7 years ago
committed by GitHub
parent
commit
3e2d6ea408
2 changed files with 3 additions and 1 deletions
  1. +2
    -0
      .env.production.sample
  2. +1
    -1
      config/initializers/paperclip.rb

+ 2
- 0
.env.production.sample View File

@ -39,6 +39,8 @@ SMTP_FROM_ADDRESS=notifications@example.com
# AWS_ACCESS_KEY_ID=
# AWS_SECRET_ACCESS_KEY=
# S3_REGION=
# S3_PROTOCOL=http
# S3_HOSTNAME=192.168.1.123:9000
# Optional alias for S3 if you want to use Cloudfront or Cloudflare in front
# S3_CLOUDFRONT_HOST=

+ 1
- 1
config/initializers/paperclip.rb View File

@ -11,7 +11,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] = ENV.fetch('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'

Loading…
Cancel
Save