From 9f7338fabf8a1a12ed63903b1a4e1425bbca967b Mon Sep 17 00:00:00 2001
From: Kay0u <pierre@kayou.io>
Date: Fri, 2 Feb 2024 08:13:34 +0100
Subject: [PATCH] 16.8.1

---
 conf/gitlab.rb                    | 15 ++++++++++++++-
 manifest.toml                     |  2 +-
 scripts/upgrade.d/upgrade.last.sh | 18 +++++++++---------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/conf/gitlab.rb b/conf/gitlab.rb
index f254655..01c8a57 100644
--- a/conf/gitlab.rb
+++ b/conf/gitlab.rb
@@ -801,6 +801,8 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__
 
 ### Gitlab decomposed database settings
 ###! Docs: https://docs.gitlab.com/omnibus/settings/database.html
+# gitlab_rails['databases']['main']['db_database'] = 'gitlabhq_production'
+# gitlab_rails['databases']['main']['database_tasks'] = true
 # gitlab_rails['databases']['ci']['enable'] = true
 # gitlab_rails['databases']['ci']['db_database'] = 'gitlabhq_production'
 # gitlab_rails['databases']['ci']['database_tasks'] = false
@@ -1190,6 +1192,10 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__
 # gitlab_workhorse['redis_sentinel_master_ip'] = nil
 # gitlab_workhorse['redis_sentinel_master_port'] = nil
 
+
+##! Command to generate extra configuration
+# gitlab_workhorse['extra_config_command'] = nil
+
 ################################################################################
 ## GitLab User Settings
 ##! Modify default git user.
@@ -2181,7 +2187,7 @@ nginx['listen_https'] = false
 # gitlab_kas['redis_port'] = '6379'
 # gitlab_kas['redis_password'] = nil
 
-# gitlab_kas['redis_sentinels'] = {}
+# gitlab_kas['redis_sentinels'] = []
 # gitlab_kas['redis_sentinels_master_name'] = nil
 # gitlab_kas['redis_sentinels_password'] = ''
 
@@ -2190,6 +2196,9 @@ nginx['listen_https'] = false
 # gitlab_kas['redis_tls_client_cert_file'] = nil
 # gitlab_kas['redis_tls_client_key_file'] = nil
 
+##! Command to generate extra configuration
+# gitlab_kas['extra_config_command'] = nil
+
 ################################################################################
 ## GitLab Suggested Reviewers (EE Only)
 ##! Docs: https://docs.gitlab.com/ee/user/project/merge_requests/reviews/#suggested-reviewers
@@ -2528,6 +2537,9 @@ nginx['listen_https'] = false
 ##! Semantic metadata used when registering GitLab Exporter as a Consul service
 # gitlab_exporter['consul_service_meta'] = {}
 
+##! Command to generate extra configuration
+# gitlab_exporter['extra_config_command'] = nil
+
 # To completely disable prometheus, and all of it's exporters, set to false
 # prometheus_monitoring['enable'] = true
 
@@ -3063,6 +3075,7 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__
 ## GitLab Geo Log Cursor Daemon (EE only)
 ################################################################################
 
+# geo_logcursor['enable'] = false
 # geo_logcursor['log_directory'] = '/var/log/gitlab/geo-logcursor'
 # geo_logcursor['log_group'] = nil
 
diff --git a/manifest.toml b/manifest.toml
index 61b4527..d4c93b2 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "GitLab"
 description.en = "Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features"
 description.fr = "Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD"
 
-version = "16.7.3~ynh1"
+version = "16.8.1~ynh1"
 
 maintainers = ["kay0u"]
 
diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh
index a44d90c..2f3cce1 100644
--- a/scripts/upgrade.d/upgrade.last.sh
+++ b/scripts/upgrade.d/upgrade.last.sh
@@ -1,22 +1,22 @@
 #!/bin/bash
 
-gitlab_version="16.7.3"
+gitlab_version="16.8.1"
 
 # Upgrade path: https://gitlab-com.gitlab.io/support/toolbox/upgrade-path/
 # sha256sum found here: https://packages.gitlab.com/gitlab
 gitlab_debian_version="$(lsb_release -sc)"
 
-gitlab_x86_64_bookworm_source_sha256="7e1683956b2e33f17ce4be3f0d5e5751d915fc92a5a0554bbf257ad2a21963a0"
-gitlab_x86_64_bullseye_source_sha256="22fe358741c994259bb6edc693d6ee273320543fc0fc81a0f231295aea8aa4c9"
-gitlab_x86_64_buster_source_sha256="d6e48115716c664c9c56a683499d8697f015b07443f5a4e1256ece3c73e4d4c2"
+gitlab_x86_64_bookworm_source_sha256="119cb1a085202257fbf2d6ae1e8b5d27f2dafbf1b1abcfeb1011e854f0964043"
+gitlab_x86_64_bullseye_source_sha256="56ec42ca2e0a7ed45507c8f870be9a80fdabb98702da8cd0c81f0c261fa6147b"
+gitlab_x86_64_buster_source_sha256="5e13d37cbcce2be6359a94a483b063bacf88ed745fd7edc3973f066a48009a11"
 
-gitlab_arm64_bookworm_source_sha256="df267bb8820370a730a3977711744384271f870e18fd5a1c82fa8faa78e9cb36"
-gitlab_arm64_bullseye_source_sha256="1f3116e27d59614f382aab847ddedae99bed82216cd92112ad71315a8a713d79"
-gitlab_arm64_buster_source_sha256="ddf5aabe2b25830f7bb6f1715b73cad39e60837397cf8439d133503e8f20946e"
+gitlab_arm64_bookworm_source_sha256="eb95af3527fad21bc4536a2703dc039c5c9e9d8b24a6cfd4f6d310b6498ebae2"
+gitlab_arm64_bullseye_source_sha256="c21c03856b04ebdd6552b2a7865786dd7fa6789c99d1106fbfad960fdd0338ec"
+gitlab_arm64_buster_source_sha256="ab0c167dfa89e5bfe86e303462a5c579d60421a0ad4e13675068ae0a6fa78223"
 
 gitlab_arm_bookworm_source_sha256=""
-gitlab_arm_bullseye_source_sha256="cb771cec30ff09fd7260748c37e878485bc67d95dbe52183664850fb5544771a"
-gitlab_arm_buster_source_sha256="5bdec83f9f8e2b0d1ed16eeb9811a882e7e82659c5f4694e071971a909f8be8e"
+gitlab_arm_bullseye_source_sha256="3ff3715f56bda621d31adc2cb0883323e8ca2494a7de627188a6ed3a9bee7573"
+gitlab_arm_buster_source_sha256="79a1fb41072cc3793dec637185375f722298f7254b44d0048e1f8fbad2343670"
 
 architecture=$(ynh_app_setting_get --app="$app" --key=architecture)