From 74186bf40ae3d2a41ff8c53733d0eebcb24fd7b7 Mon Sep 17 00:00:00 2001
From: Adi Buchmann <adrian.buchmann@getabstract.com>
Date: Thu, 5 May 2022 12:55:28 +0200
Subject: [PATCH 1/2] feat(Config): Allow AWS independent S3 storage

---
 .env.example  | 1 +
 src/config.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.env.example b/.env.example
index 7d9062a48..dd29f21f1 100644
--- a/.env.example
+++ b/.env.example
@@ -37,6 +37,7 @@ EXPRESS_PORT=8081
 #FS_S3_ACCESS_KEY_ID=
 #FS_S3_SECRET_ACCESS_KEY=
 #FS_S3_REGION=
+#FS_S3_ENDPOINT=
 
 # Google Storage
 #FS_GOOGLE_CLOUD_BUCKET=
diff --git a/src/config.ts b/src/config.ts
index a3c3f4eb0..78be749a5 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -75,6 +75,7 @@ export default {
       accessKeyId: getStringOption(process.env.FS_S3_ACCESS_KEY_ID, globalAwsIamAccessKeyId),
       apiVersion: '2006-03-01',
       region: getStringOption(process.env.FS_S3_REGION, globalAwsRegion),
+      endpoint: process.env.FS_S3_ENDPOINT,
       secretAccessKey: getStringOption(
         process.env.FS_S3_SECRET_ACCESS_KEY,
         globalAwsIamAccessKeySecret,

From 57621c025bc914fe356ce9375dcc2ed182249a93 Mon Sep 17 00:00:00 2001
From: Adi Buchmann <adrian.buchmann@getabstract.com>
Date: Mon, 30 May 2022 16:55:52 +0200
Subject: [PATCH 2/2] feat(Config): Allow AWS independent S3 storage - adjusted
 pathstyle

---
 src/config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/config.ts b/src/config.ts
index 78be749a5..66d233d7e 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -76,6 +76,7 @@ export default {
       apiVersion: '2006-03-01',
       region: getStringOption(process.env.FS_S3_REGION, globalAwsRegion),
       endpoint: process.env.FS_S3_ENDPOINT,
+      s3ForcePathStyle: process.env.FS_S3_ENDPOINT != null,
       secretAccessKey: getStringOption(
         process.env.FS_S3_SECRET_ACCESS_KEY,
         globalAwsIamAccessKeySecret,