From c46843c65c0761f97d894f21e361489a0fa1a60a Mon Sep 17 00:00:00 2001
From: leopku <leopku@qq.com>
Date: Thu, 23 Mar 2017 15:44:55 +0800
Subject: :wrench: S3 protocol  from ENV

add support for reading S3 protocol from ENV
also add S3_HOSTNAME in .env.production.sample
---
 config/initializers/paperclip.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config/initializers/paperclip.rb')

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index 580a3196e..2a2ef8fea 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -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'
-- 
cgit