Merge pull request keystonejs#10 from blargity/improve-region-handling

Region handling clarity
cvn · Nov 23, 2016 · 4fb4ce1 · 4fb4ce1
2 parents 0e5de3e + 38a49a9
commit 4fb4ce1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -15,6 +15,7 @@ var storage = new keystone.Storage({
     key: 's3-key', // required; defaults to process.env.S3_KEY
     secret: 'secret', // required; defaults to process.env.S3_SECRET
     bucket: 'mybucket', // required; defaults to process.env.S3_BUCKET
+    region: 'ap-southeast-2', // optional; defaults to process.env.S3_REGION, or if that's not specified, us-east-1
     path: '/profilepics',
     headers: {
       'x-amz-acl': 'public-read', // add default headers; see below for details

diff --git a/index.js b/index.js
@@ -16,6 +16,7 @@ var DEFAULT_OPTIONS = {
 	key: process.env.S3_KEY,
 	secret: process.env.S3_SECRET,
 	bucket: process.env.S3_BUCKET,
+	region: process.env.S3_REGION || 'us-east-1',
 	generateFilename: nameFunctions.randomFilename,
 };