Merge 1677622 into 08128aa

sul-dlss · Nov 28, 2018 · 506edfa · 506edfa
2 parents 08128aa + 1677622
commit 506edfa
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/app/lib/preservation_catalog/s3.rb b/app/lib/preservation_catalog/s3.rb
@@ -18,7 +18,13 @@ def bucket_name
 
       # @return [Aws::S3::Resource]
       def resource
-        Aws::S3::Resource.new
+        if ENV['AWS_ENDPOINT']
+          # Non-Amazon S3 use endpoints to override Amazon's REGION endpoint logic.
+          Aws::S3::Resource.new(endpoint: ENV['AWS_ENDPOINT'])
+        else
+          # If AWS_ENDPOINT is not set we're using actual Amazon S3. 
+          Aws::S3::Resource.new
+        end
       end
     end
   end