diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-09-20 21:53:45 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-09-20 21:53:45 +0000 |
| commit | 9dff8567eb60902edf8cfd0399afe66ab1916157 (patch) | |
| tree | 214a10345d68469e5f082663fb21212483d9f72f | |
| parent | c2da94187d506e03289a5851b576caa36eb2d4ca (diff) | |
| parent | e9402d4894a178b2baf698c548ba0389701574a5 (diff) | |
| download | gitlab-ce-9dff8567eb60902edf8cfd0399afe66ab1916157.tar.gz | |
Merge branch 'fog-iam-docs' into 'master'
Add Fog use_iam_profile option to docs
See merge request gitlab-org/gitlab-ce!21844
| -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 1f3bc611cdf..757865ea2c5 100644 --- a/doc/administration/job_artifacts.md +++ b/doc/administration/job_artifacts.md @@ -127,6 +127,7 @@ The connection settings match those provided by [Fog](https://github.com/fog), a | `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) | | `path_style` | Set to true to use `host/bucket_name/object` style paths instead of `bucket_name.host/object`. Leave as false for AWS S3 | false | +| `use_iam_profile` | Set to true to use IAM profile instead of access keys | false **In Omnibus installations:** diff --git a/doc/administration/uploads.md b/doc/administration/uploads.md index 467deb43644..ce83da16067 100644 --- a/doc/administration/uploads.md +++ b/doc/administration/uploads.md @@ -86,6 +86,7 @@ The connection settings match those provided by [Fog](https://github.com/fog), a | `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) | | `path_style` | Set to true to use `host/bucket_name/object` style paths instead of `bucket_name.host/object`. Leave as false for AWS S3 | false | +| `use_iam_profile` | Set to true to use IAM profile instead of access keys | false **In Omnibus installations:** diff --git a/doc/workflow/lfs/lfs_administration.md b/doc/workflow/lfs/lfs_administration.md index 3f9ffedd61a..444d1483fcc 100644 --- a/doc/workflow/lfs/lfs_administration.md +++ b/doc/workflow/lfs/lfs_administration.md @@ -95,6 +95,7 @@ Here is a configuration example with S3. | `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) | | `path_style` | Set to true to use `host/bucket_name/object` style paths instead of `bucket_name.host/object`. Leave as false for AWS S3 | false | +| `use_iam_profile` | Set to true to use IAM profile instead of access keys | false Here is a configuration example with GCS. |