diff options
| author | Micaël Bergeron <mbergeron@gitlab.com> | 2018-02-21 11:43:21 -0500 |
|---|---|---|
| committer | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-01 10:34:30 -0500 |
| commit | 0f1d348d683fdef6c36c3b244c85e59f582ff886 (patch) | |
| tree | 5558ab163c6154e76a36b6345d22deb302eacc82 /config | |
| parent | a2f375e8f74870dcdcfa1c7886bd1c14c80a684e (diff) | |
| download | gitlab-ce-0f1d348d683fdef6c36c3b244c85e59f582ff886.tar.gz | |
port the object storage to CE
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 6 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 6cc90981cce..b0c517b6210 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -305,6 +305,12 @@ Settings.artifacts['storage_path'] = Settings.absolute(Settings.artifacts.values # Settings.artifact['path'] is deprecated, use `storage_path` instead Settings.artifacts['path'] = Settings.artifacts['storage_path'] Settings.artifacts['max_size'] ||= 100 # in megabytes +Settings.artifacts['object_store'] ||= Settingslogic.new({}) +Settings.artifacts['object_store']['enabled'] = false if Settings.artifacts['object_store']['enabled'].nil? +Settings.artifacts['object_store']['remote_directory'] ||= nil +Settings.artifacts['object_store']['background_upload'] = true if Settings.artifacts['object_store']['background_upload'].nil? +# Convert upload connection settings to use string keys, to make Fog happy +Settings.artifacts['object_store']['connection']&.deep_stringify_keys! Settings.artifacts['object_store'] ||= Settingslogic.new({}) Settings.artifacts['object_store']['enabled'] = false if Settings.artifacts['object_store']['enabled'].nil? diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index afea744eae6..ca1577591ba 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -69,3 +69,4 @@ - [project_migrate_hashed_storage, 1] - [storage_migrator, 1] - [pages_domain_verification, 1] + - [object_storage, 1] |