diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-07-02 08:23:41 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-07-02 08:23:41 +0000 |
| commit | 52e182102bd343d79d3ffaa6bb1ba04bc0e5da63 (patch) | |
| tree | 5ca4a326cd7a2f970b35d9930c6a08f1217726a9 /doc | |
| parent | 1ee3ac8cc60ec40a9305189043cad606aee5fab2 (diff) | |
| parent | c9c78b09767a9070856d7d09acb4d25f65d73366 (diff) | |
| download | gitlab-ce-52e182102bd343d79d3ffaa6bb1ba04bc0e5da63.tar.gz | |
Merge branch 'sh-add-s3-signature-version-docs' into 'master'
Add aws_signature_version to object storage docs
Closes #48622
See merge request gitlab-org/gitlab-ce!20257
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/administration/job_artifacts.md | 1 | ||||
| -rw-r--r-- | doc/administration/uploads.md | 1 | ||||
| -rw-r--r-- | doc/workflow/lfs/lfs_administration.md | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/doc/administration/job_artifacts.md b/doc/administration/job_artifacts.md index e59ab5a72e1..1bb018e368b 100644 --- a/doc/administration/job_artifacts.md +++ b/doc/administration/job_artifacts.md @@ -123,6 +123,7 @@ The connection settings match those provided by [Fog](https://github.com/fog), a | `provider` | Always `AWS` for compatible hosts | AWS | | `aws_access_key_id` | AWS credentials, or compatible | | | `aws_secret_access_key` | AWS credentials, or compatible | | +| `aws_signature_version` | AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. | 4 | | `region` | AWS region | us-east-1 | | `host` | S3 compatible host for when not using AWS, e.g. `localhost` or `storage.example.com` | s3.amazonaws.com | | `endpoint` | Can be used when configuring an S3 compatible service such as [Minio](https://www.minio.io), by entering a URL such as `http://127.0.0.1:9000` | (optional) | diff --git a/doc/administration/uploads.md b/doc/administration/uploads.md index 7f0bd8f04e3..6688181c5a8 100644 --- a/doc/administration/uploads.md +++ b/doc/administration/uploads.md @@ -79,6 +79,7 @@ The connection settings match those provided by [Fog](https://github.com/fog), a | `provider` | Always `AWS` for compatible hosts | AWS | | `aws_access_key_id` | AWS credentials, or compatible | | | `aws_secret_access_key` | AWS credentials, or compatible | | +| `aws_signature_version` | AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. | 4 | | `region` | AWS region | us-east-1 | | `host` | S3 compatible host for when not using AWS, e.g. `localhost` or `storage.example.com` | s3.amazonaws.com | | `endpoint` | Can be used when configuring an S3 compatible service such as [Minio](https://www.minio.io), by entering a URL such as `http://127.0.0.1:9000` | (optional) | diff --git a/doc/workflow/lfs/lfs_administration.md b/doc/workflow/lfs/lfs_administration.md index 8a2f230f505..b1afe2cee42 100644 --- a/doc/workflow/lfs/lfs_administration.md +++ b/doc/workflow/lfs/lfs_administration.md @@ -90,6 +90,7 @@ Here is a configuration example with S3. | `provider` | The provider name | AWS | | `aws_access_key_id` | AWS credentials, or compatible | `ABC123DEF456` | | `aws_secret_access_key` | AWS credentials, or compatible | `ABC123DEF456ABC123DEF456ABC123DEF456` | +| `aws_signature_version` | AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. | 4 | | `region` | AWS region | us-east-1 | | `host` | S3 compatible host for when not using AWS, e.g. `localhost` or `storage.example.com` | s3.amazonaws.com | | `endpoint` | Can be used when configuring an S3 compatible service such as [Minio](https://www.minio.io), by entering a URL such as `http://127.0.0.1:9000` | (optional) | |