aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-01-28 16:28:27 +01:00
Code Activity

only set variables if they're actively in use

Browse source 
Signed-off-by: jessebot <jessebot@linux.com>
This commit is contained in:
jessebot 2025-01-09 14:39:17 +01:00
parent 1581991664
commit e35ea1e23b
No known key found for this signature in database
2 changed files with 56 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
.config/s3.config.php
View file

@ -4,6 +4,15 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
$use_path = getenv('OBJECTSTORE_S3_USEPATH_STYLE');
$use_legacyauth = getenv('OBJECTSTORE_S3_LEGACYAUTH');
$autocreate = getenv('OBJECTSTORE_S3_AUTOCREATE');
$proxy = getenv('OBJECTSTORE_S3_PROXY');
$verify_bucket_exists = getenv('OBJECTSTORE_S3_VERIFY_BUCKET_EXISTS');
$use_multipart_copy = getenv('OBJECTSTORE_S3_USEMULTIPARTCOPY');
$concurrency = getenv('OBJECTSTORE_S3_CONCURRENCY');
$timeout = getenv('OBJECTSTORE_S3_TIMEOUT');
$upload_part_size = getenv('OBJECTSTORE_S3_UPLOADPARTSIZE');
$put_size_limit = getenv('OBJECTSTORE_S3_PUTSIZELIMIT');
$copy_size_limit = getenv('OBJECTSTORE_S3_COPYSIZELIMIT');
$CONFIG = array(
'objectstore' => array(
'class' => '\OC\Files\ObjectStore\S3',
@ -19,18 +28,35 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
// required for some non Amazon S3 implementations
'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
// required for older protocol versions
'useMultipartCopy' => strtolower($useMultipartCopy) !== 'true',
'legacy_auth' => $use_legacyauth == true && strtolower($use_legacyauth) !== 'false',
'concurrency' => getenv('OBJECTSTORE_S3_CONCURRENCY') ?: '',
'proxy' => getenv('OBJECTSTORE_S3_PROXY') ?: '',
'timeout' => getenv('OBJECTSTORE_S3_TIMEOUT') ?: '',
'uploadPartSize' => getenv('OBJECTSTORE_S3_UPLOADPARTSIZE') ?:'',
'putSizeLimit' => getenv('OBJECTSTORE_S3_PUTSIZELIMIT') ?: '',
'version' => getenv('OBJECTSTORE_S3_VERSION') ?: '',
'verify_bucket_exists' => getenv('OBJECTSTORE_S3_VERIFY_BUCKET_EXISTS') ?: ''
'proxy' => strtolower($proxy) !== 'false',
'version' => getenv('OBJECTSTORE_S3_VERSION') ?: 'latest',
'verify_bucket_exists' => strtolower($verify_bucket_exists) !== 'true'
)
)
);
if $concurrency {
$CONFIG['objectstore']['arguments']['concurrency'] = $concurrency;
}
if $timeout {
$CONFIG['objectstore']['arguments']['timeout'] = $timeout;
}
if $upload_part_size {
$CONFIG['objectstore']['arguments']['uploadPartSize'] = $upload_part_size;
}
if $put_size_limit {
$CONFIG['objectstore']['arguments']['putSizeLimit'] = $put_size_limit;
}
if $copy_size_limit {
$CONFIG['objectstore']['arguments']['copySizeLimit'] = $copy_size_limit;
}
if (getenv('OBJECTSTORE_S3_KEY_FILE')) {
$CONFIG['objectstore']['arguments']['key'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_KEY_FILE')));
} elseif (getenv('OBJECTSTORE_S3_KEY')) {

16
README.md
View file

@ -277,13 +277,15 @@ To use an external S3 compatible object store as primary storage, set the follow
- `OBJECTSTORE_S3_OBJECT_PREFIX` (default: `urn:oid:`): Prefix to prepend to the fileid
- `OBJECTSTORE_S3_AUTOCREATE` (default: `true`): Create the container if it does not exist
- `OBJECTSTORE_S3_SSE_C_KEY` (not set by default): Base64 encoded key with a maximum length of 32 bytes for server side encryption (SSE-C)
- `OBJECTSTORE_S3_CONCURRENCY` (default: `''`) defines the maximum number of concurrent multipart uploads
- `OBJECTSTORE_S3_PROXY` (default: `''`)
- `OBJECTSTORE_S3_TIMEOUT` (default: `''`)
- `OBJECTSTORE_S3_UPLOADPARTSIZE` (default: `''`)
- `OBJECTSTORE_S3_PUTSIZELIMIT` (default: `''`)
- `OBJECTSTORE_S3_VERSION` (default: `''`)
- `OBJECTSTORE_S3_VERIFY_BUCKET_EXISTS` (default: `''`)
- `OBJECTSTORE_S3_CONCURRENCY` defines the maximum number of concurrent multipart uploads
- `OBJECTSTORE_S3_PROXY` (default: `false`)
- `OBJECTSTORE_S3_TIMEOUT` (not set by default)
- `OBJECTSTORE_S3_UPLOADPARTSIZE` (not set by default)
- `OBJECTSTORE_S3_PUTSIZELIMIT` (not set by default)
- `OBJECTSTORE_S3_USEMULTIPARTCOPY` (default: `false`)
- `OBJECTSTORE_S3_COPYSIZELIMIT` (not set by default)
- `OBJECTSTORE_S3_VERSION` (default: `latest`)
- `OBJECTSTORE_S3_VERIFY_BUCKET_EXISTS` (default: `true`) Setting this to `false` after confirming the bucket has been created may provide a performance benefit, but may not be possible in multibucket scenarios.
Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#simple-storage-service-s3) for more information.