From: Stanislas <angristan@pm.me>
Date: Sun, 17 May 2020 15:27:36 +0000 (+0200)
Subject: Fix `tootctl upgrade storage-schema` S3 ACL (#13768)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ce87469d0a085b238646387fb01d78c206b83124;p=mastodon.git

Fix `tootctl upgrade storage-schema` S3 ACL (#13768)
---

diff --git a/lib/mastodon/upgrade_cli.rb b/lib/mastodon/upgrade_cli.rb
index 629834b19..570b7e6fa 100644
--- a/lib/mastodon/upgrade_cli.rb
+++ b/lib/mastodon/upgrade_cli.rb
@@ -97,7 +97,7 @@ module Mastodon
         progress.log("Moving #{object.key} to #{new_object.key}") if options[:verbose]
 
         begin
-          object.move_to(new_object) unless dry_run?
+          object.move_to(new_object, acl: attachment.s3_permissions(style)) unless dry_run?
         rescue => e
           progress.log(pastel.red("Error processing #{object.key}: #{e}"))
           success = false