Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
phd5-app
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dmstr
phd5-app
Commits
1e4398ec
Commit
1e4398ec
authored
Nov 28, 2023
by
Elias Luhr
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make s3 fs toggable
parent
63145bbf
Pipeline
#81882
passed with stage
in 3 minutes and 51 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
10 deletions
+18
-10
common.php
config/common.php
+18
-10
No files found.
config/common.php
View file @
1e4398ec
...
...
@@ -124,8 +124,10 @@ SQL;
return
$event
;
});
$s3Enabled
=
class_exists
(
'League\Flysystem\AwsS3v3\AwsS3Adapter'
)
&&
getenv
(
'AMAZON_S3_BUCKET_PUBLIC_KEY'
)
&&
getenv
(
'AMAZON_S3_BUCKET_SECRET_KEY'
)
&&
getenv
(
'AMAZON_S3_BUCKET_NAME'
)
&&
getenv
(
'AMAZON_S3_BUCKET_REGION'
);
// Basic configuration, used in web and console applications
return
[
$common
=
[
'id'
=>
'app'
,
'name'
=>
getenv
(
'APP_TITLE'
),
'language'
=>
$languages
[
0
],
...
...
@@ -258,14 +260,6 @@ return [
'class'
=>
LocalFilesystem
::
class
,
'path'
=>
'@storage'
],
'fsS3'
=>
[
'class'
=>
AwsS3Filesystem
::
class
,
'key'
=>
getenv
(
'AMAZON_S3_BUCKET_PUBLIC_KEY'
),
'secret'
=>
getenv
(
'AMAZON_S3_BUCKET_SECRET_KEY'
),
'bucket'
=>
getenv
(
'AMAZON_S3_BUCKET_NAME'
),
'prefix'
=>
getenv
(
'APP_NAME'
)
.
'/public'
,
'region'
=>
getenv
(
'AMAZON_S3_BUCKET_REGION'
)
],
'fsRuntime'
=>
[
'class'
=>
LocalFilesystem
::
class
,
'path'
=>
'@runtime'
...
...
@@ -474,7 +468,6 @@ return [
'layout'
=>
$boxLayout
,
'filesystem'
=>
getenv
(
'APP_FILEFLY_DEFAULT_FILESYSTEM'
),
'filesystemComponents'
=>
[
's3'
=>
'fsS3'
,
'local'
=>
'fsLocal'
,
'runtime'
=>
'fsRuntime'
]
...
...
@@ -564,3 +557,18 @@ return [
]
]
];
if
(
$s3Enabled
)
{
$common
[
'components'
][
'fsS3'
]
=
[
'class'
=>
AwsS3Filesystem
::
class
,
'key'
=>
getenv
(
'AMAZON_S3_BUCKET_PUBLIC_KEY'
),
'secret'
=>
getenv
(
'AMAZON_S3_BUCKET_SECRET_KEY'
),
'bucket'
=>
getenv
(
'AMAZON_S3_BUCKET_NAME'
),
'prefix'
=>
getenv
(
'APP_NAME'
)
.
'/public'
,
'region'
=>
getenv
(
'AMAZON_S3_BUCKET_REGION'
)
];
$common
[
'modules'
][
'filefly'
][
'filesystemComponents'
][
's3'
]
=
'fsS3'
;
}
return
$common
;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment