diff --git a/.env.template b/.env.template index 8a693c3f0acae73836585fcdef3d9bd918bee599..f75a125998101c6705ebace3e2d38aa928dd220f 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 3539525431d7a9d92d208d1bb7d874b405ff9ff8..c3c9bc444ac5694369dbaf5c6099ce5e180f8021 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 c3604048c85d93fce4befca73883e1e84b6ac9fb..743a73e83a4578d7d5e8246af3b6379cf8f86caa 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 045b4980432fb231018a4881e894233c6eb0a84e..4d1950535eb11506eba9adb67ff1d2b79e3494fc 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