diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 12 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 8 | ||||
| -rw-r--r-- | config/object_store_settings.rb | 2 |
3 files changed, 21 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 4ff5c3b5179..2b67572c470 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -1425,6 +1425,18 @@ test: aws_secret_access_key: AWS_SECRET_ACCESS_KEY region: us-east-1 + ci_secure_files: + enabled: true + storage_path: tmp/tests/ci_secure_files + object_store: + enabled: false + remote_directory: ci_secure_files + 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: us-east-1 + gitlab: host: localhost port: 80 diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 2587347719a..f65c76d8b6b 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -247,6 +247,14 @@ Settings.gitlab_ci['builds_path'] = Settings.absolute(Settings.gitlab_ Settings.gitlab_ci['url'] ||= Settings.__send__(:build_gitlab_ci_url) # +# CI Secure Files +# +Settings['ci_secure_files'] ||= Settingslogic.new({}) +Settings.ci_secure_files['enabled'] = true if Settings.ci_secure_files['enabled'].nil? +Settings.ci_secure_files['storage_path'] = Settings.absolute(Settings.ci_secure_files['storage_path'] || File.join(Settings.shared['path'], "ci_secure_files")) +Settings.ci_secure_files['object_store'] = ObjectStoreSettings.legacy_parse(Settings.ci_secure_files['object_store']) + +# # Reply by email # Settings['incoming_email'] ||= Settingslogic.new({}) diff --git a/config/object_store_settings.rb b/config/object_store_settings.rb index 8cbb3451a16..53fbfb088db 100644 --- a/config/object_store_settings.rb +++ b/config/object_store_settings.rb @@ -2,7 +2,7 @@ # Set default values for object_store settings class ObjectStoreSettings - SUPPORTED_TYPES = %w(artifacts external_diffs lfs uploads packages dependency_proxy terraform_state pages).freeze + SUPPORTED_TYPES = %w(artifacts external_diffs lfs uploads packages dependency_proxy terraform_state pages secure_files).freeze ALLOWED_OBJECT_STORE_OVERRIDES = %w(bucket enabled proxy_download).freeze # To ensure the one Workhorse credential matches the Rails config, we |