Change S3 ACL in "tootctl media remove-orphans --fix-permissions" fro…

…m fixed value to environment file's value. (mastodon#14715)
hachyderm · Sep 1, 2020 · abc91e5 · abc91e5
1 parent 7930542
commit abc91e5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb
@@ -67,6 +67,7 @@ def remove_orphans
       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 @@ def remove_orphans
           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')