Skip to content

Commit 50011f3

Browse files
authored
Merge pull request #1018 from amosfolz/develop-remove-s3-and-rackspace
Remove league/flysystem-aws-s3-v3 and league/flysystem-rackspace as core dependencies
2 parents 007d524 + 3811650 commit 50011f3

2 files changed

Lines changed: 23 additions & 2 deletions

File tree

app/sprinkles/core/composer.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@
3434
"illuminate/filesystem": "5.8.*",
3535
"league/csv": "^9.2.1",
3636
"league/flysystem": "~1.0",
37-
"league/flysystem-aws-s3-v3": "~1.0",
3837
"league/flysystem-cached-adapter": "~1.0",
39-
"league/flysystem-rackspace": "~1.0",
4038
"league/flysystem-sftp": "~1.0",
4139
"monolog/monolog": "^1",
4240
"phpmailer/phpmailer": "^6.0.7",

app/sprinkles/core/config/default.php

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,11 @@
188188
/*
189189
* Amazon S3 Bucket Config. Config should go in .env file. For help, see :
190190
* https://aws.amazon.com/en/blogs/security/wheres-my-secret-access-key/
191+
*
192+
* As of version 4.3, https://github.com/thephpleague/flysystem-aws-s3-v3
193+
* is required inside a custom Sprinkle to use this filesystem.
194+
*
195+
* Include thephpleague/flysystem-aws-s3-v3 in a custom Sprinkle to use.
191196
*/
192197
's3' => [
193198
'driver' => 's3',
@@ -197,6 +202,24 @@
197202
'bucket' => getenv('AWS_BUCKET') ?: '',
198203
'url' => getenv('AWS_URL') ?: '',
199204
],
205+
/*
206+
* Rackspace Config. Config should go in .env file. see :
207+
* https://laravel.com/docs/5.8/filesystem#configuration
208+
*
209+
* As of version 4.3, https://github.com/thephpleague/flysystem-rackspace
210+
* is required inside a custom Sprinkle to use this filesystem.
211+
*
212+
* Include thephpleague/flysystem-rackspace in a custom Sprinkle to use.
213+
*/
214+
'rackspace' => [
215+
'driver' => 'rackspace',
216+
'username' => getenv('RACKSPACE_USERNAME') ?: '',
217+
'key' => getenv('RACKSPACE_KEY') ?: '',
218+
'container' => getenv('RACKSPACE_CONTAINER') ?: '',
219+
'endpoint' => getenv('RACKSPACE_ENDPOINT') ?: '',
220+
'region' => getenv('RACKSPACE_REGION') ?: '',
221+
'url_type' => getenv('RACKSPACE_URL_TYPE') ?: '',
222+
],
200223
],
201224
],
202225

0 commit comments

Comments
 (0)