diff options
| author | Côme Chilliet <91878298+come-nc@users.noreply.github.com> | 2023-01-16 09:43:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-16 09:43:53 +0100 |
| commit | 5e090d044d3d660316450c3d4d2d7bfc3bde20dd (patch) | |
| tree | 7d9c504b03440082f680fa0ffae9ea0bec3aacd2 /apps | |
| parent | 269bcdc17ae76b4ec12450396cc2419a76d983d7 (diff) | |
| parent | 710f3fd4053c233f7a63bb10528ad75e83724e52 (diff) | |
| download | nextcloud-server-5e090d044d3d660316450c3d4d2d7bfc3bde20dd.tar.gz nextcloud-server-5e090d044d3d660316450c3d4d2d7bfc3bde20dd.zip | |
Merge pull request #36075 from fmenabe/s3-storage-class
Add support for s3 storage classes
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_external/lib/Lib/Backend/AmazonS3.php | 2 | ||||
| -rw-r--r-- | apps/files_external/lib/Lib/Storage/AmazonS3.php | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/apps/files_external/lib/Lib/Backend/AmazonS3.php b/apps/files_external/lib/Lib/Backend/AmazonS3.php index 26da263f094..831064b632d 100644 --- a/apps/files_external/lib/Lib/Backend/AmazonS3.php +++ b/apps/files_external/lib/Lib/Backend/AmazonS3.php @@ -47,6 +47,8 @@ class AmazonS3 extends Backend { ->setFlag(DefinitionParameter::FLAG_OPTIONAL), (new DefinitionParameter('region', $l->t('Region'))) ->setFlag(DefinitionParameter::FLAG_OPTIONAL), + (new DefinitionParameter('storageClass', $l->t('Storage Class'))) + ->setFlag(DefinitionParameter::FLAG_OPTIONAL), (new DefinitionParameter('use_ssl', $l->t('Enable SSL'))) ->setType(DefinitionParameter::VALUE_BOOLEAN), (new DefinitionParameter('use_path_style', $l->t('Enable Path Style'))) diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php index ffa25dba999..6845d1f69c2 100644 --- a/apps/files_external/lib/Lib/Storage/AmazonS3.php +++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php @@ -583,7 +583,8 @@ class AmazonS3 extends \OC\Files\Storage\Common { $this->getConnection()->copyObject([ 'Bucket' => $this->bucket, 'Key' => $this->cleanKey($target), - 'CopySource' => S3Client::encodeKey($this->bucket . '/' . $source) + 'CopySource' => S3Client::encodeKey($this->bucket . '/' . $source), + 'StorageClass' => $this->storageClass, ]); $this->testTimeout(); } catch (S3Exception $e) { |