diff options
author | provokateurin <kate@provokateurin.de> | 2025-05-11 16:40:26 +0200 |
---|---|---|
committer | provokateurin <kate@provokateurin.de> | 2025-05-11 16:40:26 +0200 |
commit | cacc724d601721f1aae9c71c9097c85601507ef3 (patch) | |
tree | 986d9dcd5ab2ae0954e32155cce764a3e533f146 /lib/private/Files | |
parent | 195dbad119c0567ae5b486efc1a4d0102844d3df (diff) | |
download | nextcloud-server-feat/certificatemanager/default-bundle-path-option.tar.gz nextcloud-server-feat/certificatemanager/default-bundle-path-option.zip |
feat(CertificateManager): Add option to specify the default certificates bundle pathfeat/certificatemanager/default-bundle-path-option
Signed-off-by: provokateurin <kate@provokateurin.de>
Diffstat (limited to 'lib/private/Files')
-rw-r--r-- | lib/private/Files/ObjectStore/S3ConnectionTrait.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php index b7017583dc2..c4ca703c43c 100644 --- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php +++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php @@ -205,13 +205,13 @@ trait S3ConnectionTrait { protected function getCertificateBundlePath(): ?string { if ((int)($this->params['use_nextcloud_bundle'] ?? '0')) { + /** @var ICertificateManager $certManager */ + $certManager = Server::get(ICertificateManager::class); // since we store the certificate bundles on the primary storage, we can't get the bundle while setting up the primary storage if (!isset($this->params['primary_storage'])) { - /** @var ICertificateManager $certManager */ - $certManager = Server::get(ICertificateManager::class); return $certManager->getAbsoluteBundlePath(); } else { - return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt'; + return $certManager->getDefaultCertificatesBundlePath(); } } else { return null; |