diff options
| author | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-09 10:09:00 -0500 |
|---|---|---|
| committer | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-22 08:49:04 -0400 |
| commit | 44f37504fb229ab78606a5fd11f75316ebc2667b (patch) | |
| tree | 084a49e025463f67942c85c3f99edd4a827e1a89 /config | |
| parent | e1f076ecb5c0e92e62ee628b6c18bc8869812b2e (diff) | |
| download | gitlab-ce-44f37504fb229ab78606a5fd11f75316ebc2667b.tar.gz | |
Backport ee-40781-os-to-ce
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 26 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 1 |
2 files changed, 12 insertions, 15 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 075ac022674..05299adfa93 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -182,19 +182,18 @@ production: &base # storage_path: public/ # base_dir: uploads/-/system object_store: - enabled: true - remote_directory: uploads # Bucket name - # 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: eu-central-1 - # Use the following options to configure an AWS compatible host - # 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' + enabled: false + # remote_directory: uploads # Bucket name + # 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: eu-central-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: @@ -719,7 +718,6 @@ test: region: eu-central-1 uploads: storage_path: tmp/tests/public - enabled: true object_store: enabled: false connection: diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 1c9c1d67669..c811034b29d 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -64,7 +64,6 @@ - [update_user_activity, 1] - [propagate_service_template, 1] - [background_migration, 1] - - [object_storage_upload, 1] - [gcp_cluster, 1] - [project_migrate_hashed_storage, 1] - [storage_migrator, 1] |