From a8e90e1ea968c622f24064bb35427462685782e5 Mon Sep 17 00:00:00 2001
From: ynerant <ynerant@crans.org>
Date: Thu, 11 Feb 2021 15:49:26 +0100
Subject: [PATCH] [gitlab] Update gitlab default configuration
Signed-off-by: ynerant <ynerant@crans.org>
---
roles/gitlab/templates/gitlab.rb.j2 | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/roles/gitlab/templates/gitlab.rb.j2 b/roles/gitlab/templates/gitlab.rb.j2
index 9b2e7f39..504e00b7 100644
--- a/roles/gitlab/templates/gitlab.rb.j2
+++ b/roles/gitlab/templates/gitlab.rb.j2
@@ -619,6 +619,10 @@ gitlab_rails['omniauth_providers'] = [
###! Docs: https://docs.gitlab.com/ee/development/shared_files.html
# gitlab_rails['shared_path'] = '/var/opt/gitlab/gitlab-rails/shared'
+### For storing encrypted configuration files
+###! Docs: https://docs.gitlab.com/ee/administration/encrypted_configuration.html
+# gitlab_rails['encrypted_settings_path'] = '/var/opt/gitlab/gitlab-rails/shared/encrypted_settings'
+
### Wait for file system to be mounted
###! Docs: https://docs.gitlab.com/omnibus/settings/configuration.html#only-start-omnibus-gitlab-services-after-a-given-filesystem-is-mounted
# high_availability['mountpoint'] = ["/var/opt/gitlab/git-data", "/var/opt/gitlab/gitlab-rails/shared"]
@@ -835,6 +839,7 @@ gitlab_rails['omniauth_providers'] = [
# gitlab_workhorse['enable'] = true
# gitlab_workhorse['ha'] = false
+# gitlab_workhorse['alt_document_root'] = nil
# gitlab_workhorse['listen_network'] = "unix"
# gitlab_workhorse['listen_umask'] = 000
# gitlab_workhorse['listen_addr'] = "/var/opt/gitlab/gitlab-workhorse/sockets/socket"
@@ -1147,8 +1152,8 @@ gitlab_rails['omniauth_providers'] = [
# postgresql['default_statistics_target'] = 1000
### Available in PostgreSQL 9.6 and later
-# postgresql['min_wal_size'] = 80MB
-# postgresql['max_wal_size'] = 1GB
+# postgresql['min_wal_size'] = "80MB"
+# postgresql['max_wal_size'] = "1GB"
# Backup/Archive settings
# postgresql['archive_command'] = nil
@@ -1486,7 +1491,7 @@ nginx['enable'] = false
##! { "receive" => ["fsckObjects = true"], "alias" => ["st = status", "co = checkout"] }
# omnibus_gitconfig['system'] = {
-# "pack" => ["threads = 1", "useSparse = true"],
+# "pack" => ["threads = 1"],
# "receive" => ["fsckObjects = true", "advertisePushOptions = true"],
# "repack" => ["writeBitmaps = true"],
# "transfer" => ["hideRefs=^refs/tmp/", "hideRefs=^refs/keep-around/", "hideRefs=^refs/remotes/"],
@@ -1614,7 +1619,7 @@ nginx['enable'] = false
# `pages_nginx['some_setting']` and should be set separately.
# Below you can find settings that are exclusive to "GitLab Pages NGINX"
-# pages_nginx['enable'] = false
+# pages_nginx['enable'] = true
# gitlab_rails['pages_path'] = "/var/opt/gitlab/gitlab-rails/shared/pages"
@@ -1931,6 +1936,7 @@ nginx['enable'] = false
# gitlab_exporter['home'] = "/var/opt/gitlab/gitlab-exporter"
##! Advanced settings. Should be changed only if absolutely needed.
+# gitlab_exporter['server_name'] = 'webrick'
# gitlab_exporter['listen_address'] = 'localhost'
# gitlab_exporter['listen_port'] = '9168'
@@ -2164,6 +2170,7 @@ nginx['enable'] = false
# letsencrypt['auto_renew_hour'] = 0
# letsencrypt['auto_renew_minute'] = nil # Should be a number or cron expression, if specified.
# letsencrypt['auto_renew_day_of_month'] = "*/4"
+# letsencrypt['auto_renew_log_directory'] = '/var/log/gitlab/lets-encrypt'
##! Turn off automatic init system detection. To skip init detection in
##! non-docker containers. Recommended not to change.
@@ -2200,7 +2207,7 @@ nginx['enable'] = false
# gitlab_rails['historical_data_worker_cron'] = "0 12 * * *"
# gitlab_rails['pseudonymizer_worker_cron'] = "0 23 * * *"
# gitlab_rails['elastic_index_bulk_cron'] = "*/1 * * * *"
-# gitlab_rails['analytics_devops_adoption_create_all_snapshots_worker_cron'] = "0 0 1 * *"
+# gitlab_rails['analytics_devops_adoption_create_all_snapshots_worker_cron'] = "0 4 * * *"
################################################################################
## Kerberos (EE Only)
--
GitLab