mirror of
https://github.com/nextcloud/all-in-one.git
synced 2025-12-19 22:16:49 +00:00
fix: unify default initialization of s3 autocreate and use_ssl
Unify with micro-services image fix: nextcloud/docker#2309 Signed-off-by: Josh <josh.t.richards@gmail.com>
This commit is contained in:
parent
1ce3b4ec06
commit
f3c666df9a
1 changed files with 3 additions and 2 deletions
|
|
@ -16,8 +16,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
|
||||||
'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
|
'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
|
||||||
'storageClass' => getenv('OBJECTSTORE_S3_STORAGE_CLASS') ?: '',
|
'storageClass' => getenv('OBJECTSTORE_S3_STORAGE_CLASS') ?: '',
|
||||||
'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
|
'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
|
||||||
'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true,
|
'autocreate' => strtolower($autocreate) !== 'false',
|
||||||
'use_ssl' => (strtolower($use_ssl) === 'false' || $use_ssl == false) ? false : true,
|
'use_ssl' => strtolower($use_ssl) !== 'false',
|
||||||
// required for some non Amazon S3 implementations
|
// required for some non Amazon S3 implementations
|
||||||
'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
|
'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
|
||||||
// required for older protocol versions
|
// required for older protocol versions
|
||||||
|
|
@ -31,3 +31,4 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
|
||||||
$CONFIG['objectstore']['arguments']['sse_c_key'] = $sse_c_key;
|
$CONFIG['objectstore']['arguments']['sse_c_key'] = $sse_c_key;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue