Skip to content

Commit

Permalink
Merge branch 'm-knabe-reply-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Lagerregal committed Oct 18, 2022
2 parents 09e102e + 1722c17 commit e590e57
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
10 changes: 6 additions & 4 deletions Classes/Driver/AmazonS3Driver.php
Original file line number Diff line number Diff line change
Expand Up @@ -1126,12 +1126,14 @@ protected function initializeClient()
$configuration = [
'version' => '2006-03-01',
'region' => $this->configuration['region'] ?? '',
'credentials' => [
'key' => $this->configuration['key'] ?? '',
'secret' => $this->configuration['secretKey'] ?? '',
],
'validation' => false,
];
if (!empty($this->configuration['key']) || !empty($this->configuration['secretKey'])) {
$configuration['credentials'] = [
'key' => $this->configuration['key'] ?? '',
'secret' => $this->configuration['secretKey'] ?? '',
];
}
if (!empty($GLOBALS['TYPO3_CONF_VARS']['HTTP']['proxy'])) {
$configuration['http']['proxy'] = $GLOBALS['TYPO3_CONF_VARS']['HTTP']['proxy'];
}
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Administration/DriverConfiguration/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Add the following configurations:

- Region: The region of your bucket (avoid dots in the bucket name)

- Key and secret key of your AWS account (see security credentials -> access keys)
- Key and secret key of your AWS account (optional, you can also use IAM roles or environment variables)

- Public base url (optional): this is the public url of your bucket, if empty its default to "bucketname.s3.amazonaws.com"

Expand Down
2 changes: 0 additions & 2 deletions Documentation/Introduction/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ You can create a file storage which allows you to upload/download and link the f

Requires TYPO3 CMS 10.4 or higher

German blog post: `TYPO3 CDN with AWS S3 <http://www.andersundsehr.com/blog/technik/typo3-performance-optimierung-durch-cdn>`_

Issue tracking: `GitHub Issues: AWS S3 FAL Driver <https://github.com/andersundsehr/aus_driver_amazon_s3/issues>`_


Expand Down
2 changes: 1 addition & 1 deletion Documentation/Settings.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[general]

project = Amazon AWS S3 FAL driver (CDN)
copyright = 2021 different.technology
copyright = 2022 different.technology
project_home = https://github.com/andersundsehr/aus_driver_amazon_s3
project_issues = https://github.com/andersundsehr/aus_driver_amazon_s3/issues
project_repository = https://github.com/andersundsehr/aus_driver_amazon_s3
2 changes: 1 addition & 1 deletion Documentation/Settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

---
conf.py:
copyright: 2019
copyright: 2022
project: Amazon AWS S3 FAL driver (CDN)
version: 1.12
release: 1.12.0
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Add the following configurations:
- Bucket: The name of your AWS S3 bucket
- Region: The region of your bucket (avoid dots in the bucket name)
- Key and secret key of your AWS account (see security credentials -&gt; access keys)
- Key and secret key of your AWS account (optional, you can also use IAM roles or environment variables)
- Public base url (optional): this is the public url of your bucket, if empty its default to “bucketname.s3.amazonaws.com”
- Protocol: network protocol (https://, http:// or auto detection)
Expand Down

0 comments on commit e590e57

Please sign in to comment.