DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge pull request #8044 from snipe/flysystem_tweaks

Browse source 
Tweak to Flysystem's filesystems.php to make it work with Snipe-IT
This commit is contained in:
snipe 2020-05-27 00:22:28 -07:00 committed by GitHub
parent f196b5bd94 b03f8a2425
commit f137c1ca09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
config/filesystems.php
View file

@ -45,11 +45,11 @@ $config = [
'local' => [
'driver' => 'local',
'root' => storage_path('app'),
'root' => storage_path(),
],
// This applies the LOCAL public only, not S3/FTP/etc
'public' => [
'local_public' => [
'driver' => 'local',
'root' => public_path('uploads'),
'url' => env('APP_URL').'/uploads',
@ -64,6 +64,20 @@ $config = [
'bucket' => env('AWS_BUCKET'),
'url' => env('AWS_URL'),
'root' => env('AWS_BUCKET_ROOT'),
//'visibility' => 'public'
],
's3_private' => [
// This bucket (if different than the 's3' bucket above) can be configured within AWS to *never* permit public documents
// For security reasons, its best to use separate buckets for public and private documents in S3
'driver' => 's3',
'key' => env('PRIVATE_AWS_ACCESS_KEY_ID'),
'secret' => env('PRIVATE_AWS_SECRET_ACCESS_KEY'),
'region' => env('PRIVATE_AWS_DEFAULT_REGION'),
'bucket' => env('PRIVATE_AWS_BUCKET'),
'url' => env('PRIVATE_AWS_URL'),
'root' => env('PRIVATE_AWS_BUCKET_ROOT'),
'visibility' => 'private'
],
'rackspace' => [
@ -80,11 +94,8 @@ $config = [
];
// When you're dealing with local file storage, the paths will be different than S3
if (env('FILESYSTEM_DISK','local')!='local')
{
$config['disks']['public'] = $config['disks'][env('FILESYSTEM_DISK')];
$config['disks']['public']['visibility'] = 'public';
}
// copy the selected PUBLIC_FILESYSTEM_DISK's configuration to the 'public' key for easy use
// (by default, the PUBLIC_FILESYSTEM DISK is 'local_public', in the public/uploads directory)
$config['disks']['public'] = $config['disks'][env('PUBLIC_FILESYSTEM_DISK','local_public')];
return $config;