Merge branch 'master' into develop

2017-12-18 11:31:05 +00:00
parent 73576f73d6 3f0e742421
commit 0da4d7db6f
11 changed files with 40 additions and 61 deletions
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -57,9 +57,9 @@ return [

        's3' => [
            'driver' => 's3',
-            'key' => env('AWS_KEY'),
-            'secret' => env('AWS_SECRET'),
-            'region' => env('AWS_REGION'),
+            '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'),
        ],