Merge pull request #10414 from nanaya/s3-custom

Add support for non-AWS S3 compatible storage
ppy · Jul 31, 2023 · e1911a2 · e1911a2
2 parents 213d905 + c463452
commit e1911a2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/.env.example b/.env.example
@@ -69,6 +69,9 @@ SLACK_ENDPOINT=https://myconan.net/null/
 # S3_BASE_URL=
 # S3_MINI_URL=
 
+# S3_ENDPOINT=
+# S3_USE_PATH_STYLE_ENDPOINT=false
+
 # S3_SOLO_REPLAY_BUCKET=solo-scores-replays
 
 # S3_AVATAR_KEY=

diff --git a/config/filesystems.php b/config/filesystems.php
@@ -1,5 +1,15 @@
 <?php
 
+$s3Default = [
+    'bucket' => env('S3_BUCKET'),
+    'driver' => 's3',
+    'endpoint' => env('S3_ENDPOINT'),
+    'key' => env('S3_KEY'),
+    'region' => env('S3_REGION'),
+    'secret' => env('S3_SECRET'),
+    'use_path_style_endpoint' => get_bool(env('S3_USE_PATH_STYLE_ENDPOINT')) ?? false,
+];
+
 foreach (['osu', 'taiko', 'fruits', 'mania'] as $mode) {
     $replays[$mode] = [
         'local' => [
@@ -8,10 +18,7 @@
         ],
 
         's3' => [
-            'driver' => 's3',
-            'key' => env('S3_KEY'),
-            'secret' => env('S3_SECRET'),
-            'region' => env('S3_REGION'),
+            ...$s3Default,
             'bucket' => "replay-{$mode}",
         ],
     ];
@@ -79,29 +86,22 @@
         ],
 
         's3' => [
-            'driver' => 's3',
-            'key' => env('S3_KEY'),
-            'secret' => env('S3_SECRET'),
-            'region' => env('S3_REGION'),
-            'bucket' => env('S3_BUCKET'),
+            ...$s3Default,
             'base_url' => env('S3_BASE_URL'),
             'mini_url' => env('S3_MINI_URL') ?? env('S3_BASE_URL'),
         ],
 
         's3-avatar' => [
-            'driver' => 's3',
+            ...$s3Default,
+            'base_url' => env('S3_AVATAR_BASE_URL'),
+            'bucket' => env('S3_AVATAR_BUCKET'),
             'key' => env('S3_AVATAR_KEY'),
-            'secret' => env('S3_AVATAR_SECRET'),
             'region' => env('S3_AVATAR_REGION'),
-            'bucket' => env('S3_AVATAR_BUCKET'),
-            'base_url' => env('S3_AVATAR_BASE_URL'),
+            'secret' => env('S3_AVATAR_SECRET'),
         ],
 
         's3-solo-replay' => [
-            'driver' => 's3',
-            'key' => env('S3_KEY'),
-            'secret' => env('S3_SECRET'),
-            'region' => env('S3_REGION'),
+            ...$s3Default,
             'bucket' => presence(env('S3_SOLO_REPLAY_BUCKET')) ?? 'solo-scores-replays',
         ],
     ],