From 94777814be3514134464efb3110379b56fd56c90 Mon Sep 17 00:00:00 2001 From: Constantin Graf Date: Mon, 29 Apr 2024 19:22:42 +0200 Subject: [PATCH] Renamed S3 config variables; Added disk config for profile picture --- .env.ci | 10 +++++----- .env.example | 10 +++++----- config/filesystems.php | 14 +++++++------- config/jetstream.php | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.env.ci b/.env.ci index d1ef4db2..2c4b7c99 100644 --- a/.env.ci +++ b/.env.ci @@ -40,11 +40,11 @@ MAIL_ENCRYPTION=null MAIL_FROM_ADDRESS="hello@example.com" MAIL_FROM_NAME="${APP_NAME}" -AWS_ACCESS_KEY_ID= -AWS_SECRET_ACCESS_KEY= -AWS_DEFAULT_REGION=us-east-1 -AWS_BUCKET= -AWS_USE_PATH_STYLE_ENDPOINT=false +S3_ACCESS_KEY_ID= +S3_SECRET_ACCESS_KEY= +S3_REGION=us-east-1 +S3_BUCKET= +S3_USE_PATH_STYLE_ENDPOINT=false PUSHER_APP_ID= PUSHER_APP_KEY= diff --git a/.env.example b/.env.example index 3dadafcb..ad54e756 100644 --- a/.env.example +++ b/.env.example @@ -48,11 +48,11 @@ MAIL_ENCRYPTION=null MAIL_FROM_ADDRESS="no-reply@solidtime.test" MAIL_FROM_NAME="${APP_NAME}" -AWS_ACCESS_KEY_ID= -AWS_SECRET_ACCESS_KEY= -AWS_DEFAULT_REGION=us-east-1 -AWS_BUCKET= -AWS_USE_PATH_STYLE_ENDPOINT=false +S3_ACCESS_KEY_ID= +S3_SECRET_ACCESS_KEY= +S3_REGION=us-east-1 +S3_BUCKET= +S3_USE_PATH_STYLE_ENDPOINT=false PUSHER_APP_ID= PUSHER_APP_KEY= diff --git a/config/filesystems.php b/config/filesystems.php index 508cc76c..259e48db 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -48,13 +48,13 @@ return [ 's3' => [ 'driver' => 's3', - 'key' => env('AWS_ACCESS_KEY_ID'), - 'secret' => env('AWS_SECRET_ACCESS_KEY'), - 'region' => env('AWS_DEFAULT_REGION'), - 'bucket' => env('AWS_BUCKET'), - 'url' => env('AWS_URL'), - 'endpoint' => env('AWS_ENDPOINT'), - 'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false), + 'key' => env('S3_ACCESS_KEY_ID'), + 'secret' => env('S3_SECRET_ACCESS_KEY'), + 'region' => env('S3_REGION'), + 'bucket' => env('S3_BUCKET'), + 'url' => env('S3_URL'), + 'endpoint' => env('S3_ENDPOINT'), + 'use_path_style_endpoint' => env('S3_USE_PATH_STYLE_ENDPOINT', false), 'throw' => false, ], diff --git a/config/jetstream.php b/config/jetstream.php index a2f06572..fc04c5bd 100644 --- a/config/jetstream.php +++ b/config/jetstream.php @@ -78,6 +78,6 @@ return [ | */ - 'profile_photo_disk' => 'public', + 'profile_photo_disk' => env('PROFILE_PHOTO_DISK', 's3'), ];