diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-08 05:29:35 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-28 20:00:27 +0100 |
| commit | 52c3b8f31264230814d2ffa79d0987c1491676b3 (patch) | |
| tree | d5827bc9bd891c1dd602eb3cdd4e4062d2e85589 /config | |
| parent | 64701b51aeacf4f4f932f205a2d831880b757a43 (diff) | |
| download | gitlab-ce-52c3b8f31264230814d2ffa79d0987c1491676b3.tar.gz | |
Merge branch 'zj-object-store-artifacts' into 'master'
Object store for artifacts
Closes gitlab-ce#29203
See merge request !1762
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 8 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 221e3d6e03b..28e9a5f420a 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -138,6 +138,14 @@ production: &base enabled: true # The location where build artifacts are stored (default: shared/artifacts). # path: shared/artifacts + # object_store: + # enabled: false + # remote_directory: artifacts + # connection: + # provider: AWS # Only AWS supported at the moment + # aws_access_key_id: AWS_ACCESS_KEY_ID + # aws_secret_access_key: AWS_SECRET_ACCESS_KEY + # region: eu-central-1 ## Git LFS lfs: diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index fa33e602e93..319af2e0b66 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -268,6 +268,12 @@ Settings.artifacts['enabled'] = true if Settings.artifacts['enabled'].nil? Settings.artifacts['path'] = Settings.absolute(Settings.artifacts['path'] || File.join(Settings.shared['path'], "artifacts")) 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 +# Convert upload connection settings to use symbol keys, to make Fog happy +Settings.artifacts['object_store']['connection']&.deep_symbolize_keys! + # # Registry # |