Merge branch 'develop' into develop

config/backups.php

@@ -33,6 +33,8 @@ return [
             // backup for that server lives within that folder.
             'prefix' => env('AWS_BACKUPS_BUCKET') ?? '',
 
+            'endpoint' => env('AWS_ENDPOINT'),
+            'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
             'use_accelerate_endpoint' => env('AWS_BACKUPS_USE_ACCELERATE', false),
         ],
     ],

config/database.php

@@ -1,5 +1,7 @@
 <?php
 
+use Pterodactyl\Helpers\Time;
+
 return [
     /*
     |--------------------------------------------------------------------------
@@ -43,6 +45,7 @@ return [
             'collation' => 'utf8mb4_unicode_ci',
             'prefix' => env('DB_PREFIX', ''),
             'strict' => env('DB_STRICT_MODE', false),
+            'timezone' => env('DB_TIMEZONE', Time::getMySQLTimezoneOffset(env('APP_TIMEZONE')))
         ],
 
         /*
@@ -65,6 +68,7 @@ return [
             'collation' => 'utf8mb4_unicode_ci',
             'prefix' => '',
             'strict' => false,
+            'timezone' => env('DB_TIMEZONE', Time::getMySQLTimezoneOffset(env('APP_TIMEZONE')))
         ],
     ],
 

config/filesystems.php

@@ -58,6 +58,8 @@ return [
             'secret' => env('AWS_SECRET_ACCESS_KEY'),
             'region' => env('AWS_DEFAULT_REGION'),
             'bucket' => env('AWS_BUCKET'),
+            'endpoint' => env('AWS_ENDPOINT'),
+            'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
         ],
     ],
 ];

config/session.php

@@ -188,5 +188,5 @@ return [
     |
     */
 
-    'same_site' => null,
+    'same_site' => env('SESSION_SAMESITE_COOKIE', 'lax'),
 ];