diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-27 17:50:47 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-27 17:50:47 +0000 |
| commit | ee189fd511e1a2c06f05e0d40e1d0b8875151391 (patch) | |
| tree | 68f6dd017ed89dbdcc764b1075182068778133c8 | |
| parent | 4c91ea317b103e314ed0b113651114f79f500a39 (diff) | |
| parent | 5794b1caf6656d2e4f583e8499751c48ac1f26e4 (diff) | |
| download | gitlab-ce-ee189fd511e1a2c06f05e0d40e1d0b8875151391.tar.gz | |
Merge branch 'fix-uploads-in-gitlab.yml' into 'master'
Fix example config miss-alignment in uploads.object_store.connection
Closes gitlab-development-kit#342
See merge request gitlab-org/gitlab-ce!18622
| -rw-r--r-- | config/gitlab.yml.example | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index a292be79a00..6aad8e93dcc 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -184,18 +184,18 @@ production: &base # base_dir: uploads/-/system object_store: enabled: false - # remote_directory: uploads # Bucket name + remote_directory: uploads # Bucket name # direct_upload: false # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false) # background_upload: false # Temporary option to limit automatic upload (Default: true) # proxy_download: false # Passthrough all downloads via GitLab instead of using Redirects to Object Storage - connection: - provider: AWS - aws_access_key_id: AWS_ACCESS_KEY_ID - aws_secret_access_key: AWS_SECRET_ACCESS_KEY - region: us-east-1 - # host: 'localhost' # default: s3.amazonaws.com - # endpoint: 'http://127.0.0.1:9000' # default: nil - # path_style: true # Use 'host/bucket_name/object' instead of 'bucket_name.host/object' + connection: + provider: AWS + aws_access_key_id: AWS_ACCESS_KEY_ID + aws_secret_access_key: AWS_SECRET_ACCESS_KEY + region: us-east-1 + # host: 'localhost' # default: s3.amazonaws.com + # endpoint: 'http://127.0.0.1:9000' # default: nil + # path_style: true # Use 'host/bucket_name/object' instead of 'bucket_name.host/object' ## GitLab Pages pages: |