From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Wed, 19 Apr 2017 12:18:50 +0000 (+0900)
Subject: Change to switch signature version for Amazon S3 (#2124)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=8b8e140c7155a94efd2b72d43d18c478a10f3582;p=mastodon.git

Change to switch signature version for Amazon S3 (#2124)
---

diff --git a/.env.production.sample b/.env.production.sample
index 28afee246..16ffd0803 100644
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -74,6 +74,7 @@ SMTP_FROM_ADDRESS=notifications@example.com
 # S3_PROTOCOL=https
 # S3_HOSTNAME=
 # S3_ENDPOINT=
+# S3_SIGNATURE_VERSION=
 
 # 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 ffaa2566e..af65ca818 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -28,6 +28,7 @@ if ENV['S3_ENABLED'] == 'true'
   unless ENV['S3_ENDPOINT'].blank?
     Paperclip::Attachment.default_options[:s3_options] = {
       endpoint: ENV['S3_ENDPOINT'],
+      signature_version: ENV['S3_SIGNATURE_VERSION'] || 'v4',
       force_path_style: true,
     }