From 7e9d77ff1c2e6fbb938e8d8a98a888a38fee05b6 Mon Sep 17 00:00:00 2001
From: Anusha Ranganathan <anusha@cottagelabs.com>
Date: Fri, 23 Sep 2022 10:20:54 +0100
Subject: [PATCH] Changed name of s3 bucket env variable
---
.env.template | 2 +-
.env.template.development | 2 +-
hyrax/app/services/s3_storage_service.rb | 2 +-
hyrax/config/initializers/carrierwave.rb | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.env.template b/.env.template
index 8a693c3f..f75a1259 100644
--- a/.env.template
+++ b/.env.template
@@ -107,4 +107,4 @@ S3_ENDPOINT=https://s3.location.example.com
S3_ACCESS_KEY=
S3_SECRET_KEY=
S3_REGION=
-S3_BUCKET=
\ No newline at end of file
+S3_FILE_UPLOAD_BUCKET=
\ No newline at end of file
diff --git a/.env.template.development b/.env.template.development
index 35395254..c3c9bc44 100644
--- a/.env.template.development
+++ b/.env.template.development
@@ -110,4 +110,4 @@ S3_ENDPOINT=
S3_ACCESS_KEY=
S3_SECRET_KEY=
S3_REGION=
-S3_BUCKET=
\ No newline at end of file
+S3_FILE_UPLOAD_BUCKET=
\ No newline at end of file
diff --git a/hyrax/app/services/s3_storage_service.rb b/hyrax/app/services/s3_storage_service.rb
index c3604048..743a73e8 100644
--- a/hyrax/app/services/s3_storage_service.rb
+++ b/hyrax/app/services/s3_storage_service.rb
@@ -145,7 +145,7 @@ class S3StorageService
def move_object(source_object_key, target_bucket_name, target_object_key, metadata = {})
source_bucket = bucket = Aws::S3::Resource
.new(region: ENV['S3_REGION'])
- .bucket(ENV['S3_BUCKET'])
+ .bucket(ENV['S3_FILE_UPLOAD_BUCKET'])
source_object = source_bucket.object(source_object_key)
diff --git a/hyrax/config/initializers/carrierwave.rb b/hyrax/config/initializers/carrierwave.rb
index 045b4980..4d195053 100644
--- a/hyrax/config/initializers/carrierwave.rb
+++ b/hyrax/config/initializers/carrierwave.rb
@@ -1,6 +1,6 @@
CarrierWave.configure do |config|
config.storage = :aws
- config.aws_bucket = ENV.fetch('S3_BUCKET') # for AWS-side bucket access permissions config, see section below
+ config.aws_bucket = ENV.fetch('S3_FILE_UPLOAD_BUCKET') # for AWS-side bucket access permissions config, see section below
config.aws_acl = 'private'
# Optionally define an asset host for configurations that are fronted by a
--
GitLab