From 5a2f06fb839bcf74487e41261cb52ab49508dbf9 Mon Sep 17 00:00:00 2001
From: Marton Schneider <marton@schneider.co.nl>
Date: Sat, 18 Nov 2023 13:02:47 +0100
Subject: [PATCH] add support endpoint URL for S3

---
 .env               | 1 +
 app/init.php       | 6 ++++--
 docker-compose.yml | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.env b/.env
index ad551e705a..3554103bb5 100644
--- a/.env
+++ b/.env
@@ -31,6 +31,7 @@ _APP_STORAGE_S3_ACCESS_KEY=
 _APP_STORAGE_S3_SECRET=
 _APP_STORAGE_S3_REGION=us-east-1
 _APP_STORAGE_S3_BUCKET=
+_APP_STORAGE_S3_ENDPOINT_URL=
 _APP_STORAGE_DO_SPACES_ACCESS_KEY=
 _APP_STORAGE_DO_SPACES_SECRET=
 _APP_STORAGE_DO_SPACES_REGION=us-east-1
diff --git a/app/init.php b/app/init.php
index 2c0219eec2..0d8db2c0d3 100644
--- a/app/init.php
+++ b/app/init.php
@@ -1235,6 +1235,7 @@ function getDevice($root): Device
         $accessSecret = '';
         $bucket = '';
         $region = '';
+        $url = App::getEnv('_APP_STORAGE_S3_ENDPOINT_URL', '');
 
         try {
             $dsn = new DSN($connection);
@@ -1249,7 +1250,7 @@ function getDevice($root): Device
 
         switch ($device) {
             case Storage::DEVICE_S3:
-                return new S3($root, $accessKey, $accessSecret, $bucket, $region, $acl);
+                return new S3($root, $accessKey, $accessSecret, $bucket, $region, $acl, $url);
             case STORAGE::DEVICE_DO_SPACES:
                 return new DOSpaces($root, $accessKey, $accessSecret, $bucket, $region, $acl);
             case Storage::DEVICE_BACKBLAZE:
@@ -1273,7 +1274,8 @@ function getDevice($root): Device
                 $s3Region = App::getEnv('_APP_STORAGE_S3_REGION', '');
                 $s3Bucket = App::getEnv('_APP_STORAGE_S3_BUCKET', '');
                 $s3Acl = 'private';
-                return new S3($root, $s3AccessKey, $s3SecretKey, $s3Bucket, $s3Region, $s3Acl);
+                $s3EndpointUrl = App::getEnv('_APP_STORAGE_S3_ENDPOINT_URL', '');
+                return new S3($root, $s3AccessKey, $s3SecretKey, $s3Bucket, $s3Region, $s3Acl, $s3EndpointUrl);
             case Storage::DEVICE_DO_SPACES:
                 $doSpacesAccessKey = App::getEnv('_APP_STORAGE_DO_SPACES_ACCESS_KEY', '');
                 $doSpacesSecretKey = App::getEnv('_APP_STORAGE_DO_SPACES_SECRET', '');
diff --git a/docker-compose.yml b/docker-compose.yml
index 42091e5e46..5860ea3475 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -139,6 +139,7 @@ services:
       - _APP_STORAGE_S3_SECRET
       - _APP_STORAGE_S3_REGION
       - _APP_STORAGE_S3_BUCKET
+      - _APP_STORAGE_S3_ENDPOINT_URL=
       - _APP_STORAGE_DO_SPACES_ACCESS_KEY
       - _APP_STORAGE_DO_SPACES_SECRET
       - _APP_STORAGE_DO_SPACES_REGION
@@ -329,6 +330,7 @@ services:
       - _APP_STORAGE_S3_SECRET
       - _APP_STORAGE_S3_REGION
       - _APP_STORAGE_S3_BUCKET
+      - _APP_STORAGE_S3_ENDPOINT_URL=
       - _APP_STORAGE_DO_SPACES_ACCESS_KEY
       - _APP_STORAGE_DO_SPACES_SECRET
       - _APP_STORAGE_DO_SPACES_REGION
@@ -429,6 +431,7 @@ services:
       - _APP_STORAGE_S3_SECRET
       - _APP_STORAGE_S3_REGION
       - _APP_STORAGE_S3_BUCKET
+      - _APP_STORAGE_S3_ENDPOINT_URL=
       - _APP_STORAGE_DO_SPACES_ACCESS_KEY
       - _APP_STORAGE_DO_SPACES_SECRET
       - _APP_STORAGE_DO_SPACES_REGION