From f8d9235de63c96898b54594939d9a6a516aa98bd Mon Sep 17 00:00:00 2001
From: Tim Campbell <timetinytim@gmail.com>
Date: Tue, 1 Oct 2024 13:38:03 +0200
Subject: [PATCH] Add canned ACL when uploading assets

---
 templates/job-assets-copy.yaml | 2 ++
 values.yaml                    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/templates/job-assets-copy.yaml b/templates/job-assets-copy.yaml
index f4ec87f..d35a7bc 100644
--- a/templates/job-assets-copy.yaml
+++ b/templates/job-assets-copy.yaml
@@ -44,6 +44,8 @@ spec:
           env:
           - name: RCLONE_S3_NO_CHECK_BUCKET
             value: "true"
+          - name: RCLONE_S3_ACL
+            value: {{ required "Please specify a canned ACL for S3 asset uploads" .Values.mastodon.hooks.s3Upload.acl }}
           - name: RCLONE_CONFIG_REMOTE_TYPE
             value: s3
           - name: RCLONE_CONFIG_REMOTE_PROVIDER
diff --git a/values.yaml b/values.yaml
index e6ab46d..1bf977d 100644
--- a/values.yaml
+++ b/values.yaml
@@ -41,6 +41,7 @@ mastodon:
       enabled: false
       endpoint:
       bucket:
+      acl: public-read
       secretRef:
         name:
         keys: