From f70a965cfd57099d8f6145010ebae9ecc000a959 Mon Sep 17 00:00:00 2001 From: Joost Baaij Date: Thu, 20 Aug 2015 00:36:26 +0200 Subject: [PATCH] expose the S3 protocol as a setting --- config/initializers/pageflow.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/initializers/pageflow.rb b/config/initializers/pageflow.rb index 306dfc4..2cc8575 100644 --- a/config/initializers/pageflow.rb +++ b/config/initializers/pageflow.rb @@ -56,7 +56,7 @@ :s3_host_name => ENV['S3_HOST_NAME'] }, :s3_host_alias => ENV['S3_HOST_ALIAS'], - :s3_protocol => 'http' + :s3_protocol => ENV['S3_PROTOCOL'] ) # Default options for paperclip attachments which are supposed to @@ -66,7 +66,7 @@ :api_key => ENV['ZENCODER_API_KEY'], :output_bucket => ENV['S3_OUTPUT_BUCKET'], :s3_host_alias => ENV['S3_OUTPUT_HOST_ALIAS'], - :s3_protocol => 'http', + :s3_protocol => ENV['S3_PROTOCOL'], :attachments_version => 'v1' ) end