diff options
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 340864d2dfa..5a9811c0e91 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -271,6 +271,10 @@ production: &base # Default is '.gitlab_mailroom_secret' relative to Rails.root (i.e. root of the GitLab app). # secret_file: /home/git/gitlab/.gitlab_mailroom_secret + # File location to read encrypted incoming email secrets from + # encrypted_secret_file: /mnt/gitlab/smtp.yaml.enc + # Default: shared/encrypted_settings/incoming_email.yaml.enc + ## 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.). @@ -578,6 +582,10 @@ production: &base ci_runner_versions_reconciliation_worker: cron: "@daily" + # Periodically clean up stale runner machines. + ci_runners_stale_machines_cleanup_worker: + cron: "36 4 * * *" + # GitLab EE only jobs. These jobs are automatically enabled for an EE # installation, and ignored for a CE installation. ee_cron_jobs: @@ -1064,16 +1072,6 @@ production: &base # login_url: '/cas/login', # service_validate_url: '/cas/p3/serviceValidate', # logout_url: '/cas/logout' } } - # - { name: 'authentiq', - # # for client credentials (client ID and secret), go to https://www.authentiq.com/developers - # app_id: 'YOUR_CLIENT_ID', - # app_secret: 'YOUR_CLIENT_SECRET', - # args: { - # scope: 'aq:name email~rs address aq:push' - # # callback_url parameter is optional except when 'gitlab.host' in this file is set to 'localhost' - # # callback_url: 'YOUR_CALLBACK_URL' - # } - # } # - { name: 'github', # app_id: 'YOUR_APP_ID', # app_secret: 'YOUR_APP_SECRET', @@ -1620,10 +1618,6 @@ test: client_id: 'YOUR_AUTH0_CLIENT_ID', client_secret: 'YOUR_AUTH0_CLIENT_SECRET', namespace: 'YOUR_AUTH0_DOMAIN' } } - - { name: 'authentiq', - app_id: 'YOUR_CLIENT_ID', - app_secret: 'YOUR_CLIENT_SECRET', - args: { scope: 'aq:name email~rs address aq:push' } } - { name: 'salesforce', app_id: 'YOUR_CLIENT_ID', app_secret: 'YOUR_CLIENT_SECRET' |