diff --git a/.env.docker b/.env.docker index cc4af2147d..6c64c8074b 100644 --- a/.env.docker +++ b/.env.docker @@ -138,6 +138,13 @@ PRIVATE_AWS_BUCKET=null PRIVATE_AWS_URL=null PRIVATE_AWS_BUCKET_ROOT=null +# -------------------------------------------- +# OPTIONAL: AWS Settings +# -------------------------------------------- +AWS_ACCESS_KEY_ID=null +AWS_SECRET_ACCESS_KEY=null +AWS_DEFAULT_REGION=null + # -------------------------------------------- # OPTIONAL: LOGIN THROTTLING # -------------------------------------------- diff --git a/.env.example b/.env.example index ad8e938fc0..ad97994320 100644 --- a/.env.example +++ b/.env.example @@ -134,6 +134,13 @@ PRIVATE_AWS_BUCKET=null PRIVATE_AWS_URL=null PRIVATE_AWS_BUCKET_ROOT=null +# -------------------------------------------- +# OPTIONAL: AWS Settings +# -------------------------------------------- +AWS_ACCESS_KEY_ID=null +AWS_SECRET_ACCESS_KEY=null +AWS_DEFAULT_REGION=null + # -------------------------------------------- # OPTIONAL: LOGIN THROTTLING # -------------------------------------------- diff --git a/.env.testing b/.env.testing index 980f24f09e..227d80788f 100644 --- a/.env.testing +++ b/.env.testing @@ -38,7 +38,7 @@ IMAGE_LIB=gd # -------------------------------------------- -# OPTIONAL: AWS S3 SETTINGS +# OPTIONAL: AWS SETTINGS # -------------------------------------------- AWS_SECRET_ACCESS_KEY=null AWS_ACCESS_KEY_ID=null diff --git a/config/services.php b/config/services.php index dd594e67cb..3f7362fd51 100644 --- a/config/services.php +++ b/config/services.php @@ -32,9 +32,9 @@ return [ ], 'ses' => [ - 'key' => env('SES_KEY'), - 'secret' => env('SES_SECRET'), - 'region' => 'us-east-1', + 'key' => env('AWS_ACCESS_KEY_ID'), + 'secret' => env('AWS_SECRET_ACCESS_KEY'), + 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), ], 'stripe' => [