From abc91e5fa6a0c9d621e798ae3e2de7377696dfc0 Mon Sep 17 00:00:00 2001
From: "Y.Yamashiro" <shukukei@mojizuri.jp>
Date: Wed, 2 Sep 2020 07:17:58 +0900
Subject: [PATCH] Change S3 ACL in "tootctl media remove-orphans
--fix-permissions" from fixed value to environment file's value. (#14715)
---
lib/mastodon/media_cli.rb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb
index 31135f7fc..5f4a414b1 100644
--- a/lib/mastodon/media_cli.rb
+++ b/lib/mastodon/media_cli.rb
@@ -67,6 +67,7 @@ module Mastodon
when :s3
paperclip_instance = MediaAttachment.new.file
s3_interface = paperclip_instance.s3_interface
+ s3_permissions = Paperclip::Attachment.default_options[:s3_permissions]
bucket = s3_interface.bucket(Paperclip::Attachment.default_options[:s3_credentials][:bucket])
last_key = options[:start_after]
@@ -87,7 +88,7 @@ module Mastodon
record_map = preload_records_from_mixed_objects(objects)
objects.each do |object|
- object.acl.put(acl: 'public-read') if options[:fix_permissions] && !options[:dry_run]
+ object.acl.put(acl: s3_permissions) if options[:fix_permissions] && !options[:dry_run]
path_segments = object.key.split('/')
path_segments.delete('cache')