diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
| commit | 9f46488805e86b1bc341ea1620b866016c2ce5ed (patch) | |
| tree | f9748c7e287041e37d6da49e0a29c9511dc34768 /config/gitlab.yml.example | |
| parent | dfc92d081ea0332d69c8aca2f0e745cb48ae5e6d (diff) | |
| download | gitlab-ce-9f46488805e86b1bc341ea1620b866016c2ce5ed.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 090ec9265df..9a2e470f852 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -107,6 +107,9 @@ production: &base # S/MIME public certificate key in PEM format, will be attached to signed messages # Default is '.gitlab_smime_cert' relative to Rails.root (i.e. root of the GitLab app). # cert_file: /home/git/gitlab/.gitlab_smime_cert + # S/MIME extra CA public certificates in PEM format, will be attached to signed messages + # Optional + # ca_certs_file: /home/git/gitlab/.gitlab_smime_ca_certs # Email server smtp settings are in config/initializers/smtp_settings.rb.sample @@ -199,6 +202,9 @@ production: &base # # log_path: log/mail_room_json.log + # Whether to expunge (permanently remove) messages from the mailbox when they are deleted after delivery + expunge_deleted: false + ## Build Artifacts artifacts: enabled: true @@ -767,7 +773,7 @@ production: &base # Allow smartcard authentication enabled: false - # Path to a file containing a CA certificate + # Path to a file containing a CA certificate bundle ca_file: '/etc/ssl/certs/CA.pem' # Host and port where the client side certificate is requested by the @@ -1062,6 +1068,11 @@ production: &base # host: localhost # port: 3808 + ## ActionCable settings + action_cable: + # Number of threads used to process ActionCable connection callbacks and channel actions + # worker_pool_size: 4 + ## Monitoring # Built in monitoring settings monitoring: |