friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Config fix

pull/1236/head
Philipp 2022-02-24 23:10:35 +01:00
parent 52edb1711a
commit 3f800389dc
No known key found for this signature in database
GPG Key ID: 24A7501396EB5432
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
s3_storage/src/S3Config.php
View File

@ -199,12 +199,12 @@ class S3Config implements ICanConfigureStorage
} }
try { try {
$s3Config->setUseLegacyPathStyle(!empty($data['legacy'])); $s3Config->setUseLegacyPathStyle((bool)$data['legacy'] ?? false);
} catch (\Exception $exception) { } catch (\Exception $exception) {
$feedback['legacy'] = $exception->getMessage(); $feedback['legacy'] = $exception->getMessage();
} }
try { try {
$s3Config->setUseDualstackUrl(!empty($data['dualstack_url'])); $s3Config->setUseDualstackUrl((bool)$data['dualstack_url'] ?? false);
} catch (\Exception $exception) { } catch (\Exception $exception) {
$feedback['dualstack_url'] = $exception->getMessage(); $feedback['dualstack_url'] = $exception->getMessage();
} }
@ -233,8 +233,16 @@ class S3Config implements ICanConfigureStorage
$this->config->set('s3', 'secret_key', ($this->secretKey = new HiddenString($data['secret_key']))->getString()); $this->config->set('s3', 'secret_key', ($this->secretKey = new HiddenString($data['secret_key']))->getString());
$this->config->set('s3', 'bucket', ($this->bucket = $bucket)); $this->config->set('s3', 'bucket', ($this->bucket = $bucket));
$this->config->set('s3', 'legacy', $s3Config->getUseLegacyPathStyle()); if ($s3Config->getUseLegacyPathStyle()) {
$this->config->set('s3', 'dual_stack', $s3Config->getUseLegacyPathStyle()); $this->config->set('s3', 'legacy', '1');
} else {
$this->config->delete('s3', 'legacy');
}
if ($s3Config->getDualstackUrl()) {
$this->config->set('s3', 'dual_stack', '1');
} else {
$this->config->delete('s3', 'dual_stack');
}
$this->config->set('s3','signature_method', $s3Config->getSignatureMethod()); $this->config->set('s3','signature_method', $s3Config->getSignatureMethod());
if (!empty($data['endpoint'])) { if (!empty($data['endpoint'])) {