Merge a95f5cb into c73d5de

dadi · May 23, 2019 · 17c8c2f · 17c8c2f
2 parents c73d5de + a95f5cb
commit 17c8c2f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/config.js b/config.js
@@ -219,6 +219,12 @@ const schema = {
         format: String,
         default: '',
         env: 'AWS_S3_IMAGES_ENDPOINT'
+      },
+      pathStyle: {
+        doc: 'Forces path style access to s3 storage, helpful for storage systems with S3 support. Not required for Amazon S3 and Digital Ocean Spaces.',
+        format: Boolean,
+        default: false,
+        env: 'AWS_S3_IMAGES_PATH_STYLE'
       }
     },
     remote: {
@@ -292,6 +298,12 @@ const schema = {
         format: String,
         default: '',
         env: 'AWS_S3_ASSETS_ENDPOINT'
+      },
+      pathStyle: {
+        doc: 'Forces path style access to s3 storage, helpful for storage systems with S3 support. Not required for Amazon S3 and Digital Ocean Spaces.',
+        format: Boolean,
+        default: false,
+        env: 'AWS_S3_ASSETS_PATH_STYLE'
       }
     },
     remote: {

diff --git a/dadi/lib/storage/s3.js b/dadi/lib/storage/s3.js
@@ -11,7 +11,8 @@ const S3Storage = function ({assetType = 'assets', domain, url}) {
 
   AWS.config.update({
     accessKeyId: config.get(`${assetType}.s3.accessKey`),
-    secretAccessKey: config.get(`${assetType}.s3.secretKey`)
+    secretAccessKey: config.get(`${assetType}.s3.secretKey`),
+    s3ForcePathStyle: config.get(`${assetType}.s3.pathStyle`)
   })
 
   let region = config.get(`${assetType}.s3.region`)