diff options
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 05eab1a9b43..f5755591da7 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -9,6 +9,8 @@ # If you change this file in a merge request, please also create # # a MR on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests. # # For more details see https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/settings/gitlab.yml.md # +# Be sure to create a MR against the GDK configuration # +# file (https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/main/support/templates/gitlab/config/gitlab.yml.erb) too. # ######################################################################## # # @@ -228,6 +230,10 @@ production: &base # client_id: "YOUR-CLIENT-ID" # client_secret: "YOUR-CLIENT-SECRET" + # File that contains the shared secret key for verifying access for mailroom's incoming_email. + # Default is '.gitlab_mailroom_secret' relative to Rails.root (i.e. root of the GitLab app). + # secret_file: /home/git/gitlab/.gitlab_mailroom_secret + ## Consolidated object store config ## This will only take effect if the object_store sections are not defined ## within the types (e.g. artifacts, lfs, etc.). @@ -1421,6 +1427,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 |