mirror of
https://github.com/nextcloud/docker.git
synced 2025-04-19 18:36:09 +02:00
Merge 6c82d82549
into 3adaf30839
This commit is contained in:
commit
72f089e628
2 changed files with 9 additions and 0 deletions
|
@ -40,6 +40,14 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
|
||||||
$CONFIG['objectstore']['arguments']['secret'] = '';
|
$CONFIG['objectstore']['arguments']['secret'] = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (getenv('OBJECTSTORE_S3_SESSION_TOKEN_FILE')) {
|
||||||
|
$CONFIG['objectstore']['arguments']['session_token'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SESSION_TOKEN_FILE')));
|
||||||
|
} elseif (getenv('OBJECTSTORE_S3_SESSION_TOKEN')) {
|
||||||
|
$CONFIG['objectstore']['arguments']['session_token'] = getenv('OBJECTSTORE_S3_SESSION_TOKEN');
|
||||||
|
} else {
|
||||||
|
$CONFIG['objectstore']['arguments']['session_token'] = '';
|
||||||
|
}
|
||||||
|
|
||||||
if (getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')) {
|
if (getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')) {
|
||||||
$CONFIG['objectstore']['arguments']['sse_c_key'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')));
|
$CONFIG['objectstore']['arguments']['sse_c_key'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')));
|
||||||
} elseif (getenv('OBJECTSTORE_S3_SSE_C_KEY')) {
|
} elseif (getenv('OBJECTSTORE_S3_SSE_C_KEY')) {
|
||||||
|
|
|
@ -282,6 +282,7 @@ To use an external S3 compatible object store as primary storage, set the follow
|
||||||
- `OBJECTSTORE_S3_PORT`: The port that the object storage server is being served over
|
- `OBJECTSTORE_S3_PORT`: The port that the object storage server is being served over
|
||||||
- `OBJECTSTORE_S3_KEY`: AWS style access key
|
- `OBJECTSTORE_S3_KEY`: AWS style access key
|
||||||
- `OBJECTSTORE_S3_SECRET`: AWS style secret access key
|
- `OBJECTSTORE_S3_SECRET`: AWS style secret access key
|
||||||
|
- `OBJECTSTORE_S3_SESSION_TOKEN`: AWS style session token for STS auth workflows
|
||||||
- `OBJECTSTORE_S3_STORAGE_CLASS`: The storage class to use when adding objects to the bucket
|
- `OBJECTSTORE_S3_STORAGE_CLASS`: The storage class to use when adding objects to the bucket
|
||||||
- `OBJECTSTORE_S3_SSL` (default: `true`): Whether or not SSL/TLS should be used to communicate with object storage server
|
- `OBJECTSTORE_S3_SSL` (default: `true`): Whether or not SSL/TLS should be used to communicate with object storage server
|
||||||
- `OBJECTSTORE_S3_USEPATH_STYLE` (default: `false`): Not required for AWS S3
|
- `OBJECTSTORE_S3_USEPATH_STYLE` (default: `false`): Not required for AWS S3
|
||||||
|
|
Loading…
Add table
Reference in a new issue