Merge branch 's3-region' into 'master'
Include region in S3 configuration - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5336 See merge request !5896
This commit is contained in:
commit
1eeb92a5a5
|
@ -406,7 +406,8 @@ To configure the storage driver in Omnibus:
|
||||||
's3' => {
|
's3' => {
|
||||||
'accesskey' => 's3-access-key',
|
'accesskey' => 's3-access-key',
|
||||||
'secretkey' => 's3-secret-key-for-access-key',
|
'secretkey' => 's3-secret-key-for-access-key',
|
||||||
'bucket' => 'your-s3-bucket'
|
'bucket' => 'your-s3-bucket',
|
||||||
|
'region' => 'your-s3-region'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
@ -428,6 +429,7 @@ storage:
|
||||||
accesskey: 'AKIAKIAKI'
|
accesskey: 'AKIAKIAKI'
|
||||||
secretkey: 'secret123'
|
secretkey: 'secret123'
|
||||||
bucket: 'gitlab-registry-bucket-AKIAKIAKI'
|
bucket: 'gitlab-registry-bucket-AKIAKIAKI'
|
||||||
|
region: 'your-s3-region'
|
||||||
cache:
|
cache:
|
||||||
blobdescriptor: inmemory
|
blobdescriptor: inmemory
|
||||||
delete:
|
delete:
|
||||||
|
|
Loading…
Reference in New Issue