:wrench: S3 protocol from ENV

add support for reading S3 protocol from ENV
also add S3_HOSTNAME in .env.production.sample

diff --git a/.env.production.sample b/.env.production.sample
index ef0af9d5c2394c65910f0314172e195101b1cbb1..bd81b8fcaa0df45c4fa84bab0de63faa87d2ff79 100644 (file)
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -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=

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index 580a3196e6f5b3b4fc0b33d99ea400a9aa0e2085..2a2ef8fea7dcfb547af4747d0c1c93b69e4c018b 100644 (file)
--- 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'