eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-20 06:26:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #6903 from nextcloud/jtr/fix-s3-config-autocreate-ssl
Some checks failed
Codespell / Check spelling (push) Has been cancelled
Details
Docker Lint / docker-lint (push) Has been cancelled
Details
Lint php / php-lint (push) Has been cancelled
Details
PHP Deprecation Detector / PHP Deprecation Detector (push) Has been cancelled
Details
Static analysis / static-psalm-analysis (push) Has been cancelled
Details
Shellcheck / Check Shell (push) Has been cancelled
Details
Lint php / php-lint-summary (push) Has been cancelled
Details

Browse source 
fix: unify default initialization of s3 `autocreate`, `use_ssl`, `use_path_style` and `legacy_auth`
This commit is contained in:
Simon L. 2025-09-29 11:20:03 +02:00 • committed by GitHub
commit 216d238625
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Containers/nextcloud/config/s3.config.php
View file

@ -17,12 +17,12 @@ 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' => strtolower($use_path) === 'true',
// required for older protocol versions // required for older protocol versions
'legacy_auth' => $use_legacyauth == true && strtolower($use_legacyauth) !== 'false' 'legacy_auth' => strtolower($use_legacyauth) === 'true'
) )
) )
); );