From 96372ec921e49064b233a2a5e8c53583613ecf1a Mon Sep 17 00:00:00 2001 From: "byte[]" Date: Sat, 14 May 2022 13:54:45 -0400 Subject: [PATCH] Use a private bucket --- lib/mix/tasks/upload_to_s3.ex | 2 +- lib/philomena/images/thumbnailer.ex | 4 +--- lib/philomena/uploader.ex | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/mix/tasks/upload_to_s3.ex b/lib/mix/tasks/upload_to_s3.ex index 599ea331..bcdd8148 100644 --- a/lib/mix/tasks/upload_to_s3.ex +++ b/lib/mix/tasks/upload_to_s3.ex @@ -142,7 +142,7 @@ defmodule Mix.Tasks.UploadToS3 do {_, mime} = Mime.file(path) contents = File.read!(path) - S3.put_object(bucket(), uploaded_path, contents, acl: :public_read, content_type: mime) + S3.put_object(bucket(), uploaded_path, contents, content_type: mime) |> ExAws.request!() end diff --git a/lib/philomena/images/thumbnailer.ex b/lib/philomena/images/thumbnailer.ex index a093612d..078ed0bb 100644 --- a/lib/philomena/images/thumbnailer.ex +++ b/lib/philomena/images/thumbnailer.ex @@ -23,8 +23,6 @@ defmodule Philomena.Images.Thumbnailer do tall: {1024, 4096} ] - @acl [acl: :public_read] - def thumbnail_versions do @versions end @@ -140,7 +138,7 @@ defmodule Philomena.Images.Thumbnailer do source = Path.join(source_prefix, name) target = Path.join(target_prefix, name) - ExAws.request(S3.put_object_copy(bucket(), target, bucket(), source, @acl)) + ExAws.request(S3.put_object_copy(bucket(), target, bucket(), source)) ExAws.request(S3.delete_object(bucket(), source)) end) end diff --git a/lib/philomena/uploader.ex b/lib/philomena/uploader.ex index 1b02a4b6..9b35ebbb 100644 --- a/lib/philomena/uploader.ex +++ b/lib/philomena/uploader.ex @@ -73,11 +73,11 @@ defmodule Philomena.Uploader do content type and permissions. """ def persist_file(path, file) do - {_, mime} = Mime.file(path) + {_, mime} = Mime.file(file) file |> S3.Upload.stream_file() - |> S3.upload(bucket(), path, acl: :public_read, content_type: mime) + |> S3.upload(bucket(), path, content_type: mime) |> ExAws.request!() end