diff --git a/config/config.sample.php b/config/config.sample.php index f1c628a27b205..d56339b66f119 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -1902,6 +1902,25 @@ ], ], +/** + * To use S3 object storage + */ +'objectstore' => [ + 'class' => 'OC\\Files\\ObjectStore\\S3', + 'arguments' => [ + 'bucket' => 'nextcloud', + 'key' => 'your-access-key', + 'secret' => 'your-secret-key', + 'hostname' => 's3.example.com', + 'port' => 443, + 'use_ssl' => true, + 'region' => 'us-east-1', + // optional: Maximum number of retry attempts for failed S3 requests + // Default: 5 + 'retriesMaxAttempts' => 5, + ], +], + /** * If this is set to true and a multibucket object store is configured, then * newly created previews are put into 256 dedicated buckets. diff --git a/lib/private/Files/ObjectStore/S3ConfigTrait.php b/lib/private/Files/ObjectStore/S3ConfigTrait.php index 5b086db8f7794..661d95c4f822d 100644 --- a/lib/private/Files/ObjectStore/S3ConfigTrait.php +++ b/lib/private/Files/ObjectStore/S3ConfigTrait.php @@ -38,4 +38,6 @@ trait S3ConfigTrait { private int|float $copySizeLimit; private bool $useMultipartCopy = true; + + protected int $retriesMaxAttempts; } diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php index 5966fda62d2a2..6643a967013a1 100644 --- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php +++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php @@ -53,6 +53,7 @@ protected function parseParams($params) { $this->putSizeLimit = $params['putSizeLimit'] ?? 104857600; $this->copySizeLimit = $params['copySizeLimit'] ?? 5242880000; $this->useMultipartCopy = (bool)($params['useMultipartCopy'] ?? true); + $this->retriesMaxAttempts = $params['retriesMaxAttempts'] ?? 5; $params['region'] = empty($params['region']) ? 'eu-west-1' : $params['region']; $params['hostname'] = empty($params['hostname']) ? 's3.' . $params['region'] . '.amazonaws.com' : $params['hostname']; $params['s3-accelerate'] = $params['hostname'] === 's3-accelerate.amazonaws.com' || $params['hostname'] === 's3-accelerate.dualstack.amazonaws.com'; @@ -115,7 +116,7 @@ public function getConnection() { 'use_aws_shared_config_files' => false, 'retries' => [ 'mode' => 'standard', - 'max_attempts' => 5, + 'max_attempts' => $this->retriesMaxAttempts, ], ];