diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 4eb59fa..6fa8838 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -898,7 +898,14 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # gitlab_rails['redis_repository_cache_username'] = nil # gitlab_rails['redis_repository_cache_password'] = nil # gitlab_rails['redis_repository_cache_cluster_nodes'] = nil +# gitlab_rails['redis_workhorse_instance'] = nil +# gitlab_rails['redis_workhorse_sentinels'] = nil +# gitlab_rails['redis_workhorse_sentinels_password'] = nil +# gitlab_rails['redis_workhorse_username'] = nil +# gitlab_rails['redis_workhorse_password'] = nil +# gitlab_rails['redis_workhorse_cluster_nodes'] = nil +# gitlab_rails['redis_workhorse_sentinel_master'] = nil # gitlab_rails['redis_yml_override'] = nil @@ -949,6 +956,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # registry['validation_enabled'] = false # registry['autoredirect'] = false # registry['compatibility_schema1_enabled'] = false +# registry['database'] = nil ### Registry backend storage ###! Docs: https://docs.gitlab.com/ee/administration/packages/container_registry.html#configure-storage-for-the-container-registry @@ -965,6 +973,29 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # } # } +### Registry database +###! Docs: https://docs.gitlab.com/ee/administration/packages/container_registry.html?tab=Linux+package+%28Omnibus%29#configure-a-metadata-database-for-the-container-registry +# registry['database'] = { +# 'enabled' => true, +# 'host' => 'localhost', +# 'port' => 5432, +# 'user' => 'postgres', +# 'password' => 'postgres', +# 'dbname' => 'registry', +# 'sslmode' => 'verify-full', +# 'sslcert' => '/path/to/client.crt', +# 'sslkey' => '/path/to/client.key', +# 'sslrootcert' => '/path/to/root.crt', +# 'connecttimeout' => '5s', +# 'draintimeout' => '2m', +# 'preparedstatements' => false, +# 'pool' => { +# 'maxidle' => 25, +# 'maxopen' => 25, +# 'maxlifetime' => '5m' +# } +# } + ### Registry notifications endpoints # registry['notifications'] = [ # { @@ -2327,14 +2358,16 @@ nginx['listen_https'] = false # postgres_exporter['home'] = '/var/opt/gitlab/postgres-exporter' # postgres_exporter['log_directory'] = '/var/log/gitlab/postgres-exporter' # postgres_exporter['log_group'] = nil -# postgres_exporter['flags'] = {} +# postgres_exporter['flags'] = { +# 'collector.stat_user_tables' => false, +# 'collector.postmaster' => true +# } # postgres_exporter['listen_address'] = 'localhost:9187' # postgres_exporter['env_directory'] = '/opt/gitlab/etc/postgres-exporter/env' # postgres_exporter['env'] = { # 'SSL_CERT_DIR' => "/opt/gitlab/embedded/ssl/certs/" # } # postgres_exporter['sslmode'] = nil -# postgres_exporter['per_table_stats'] = false ##! Service name used to register Postgres Exporter as a Consul service # postgres_exporter['consul_service_name'] = 'postgres-exporter' diff --git a/manifest.toml b/manifest.toml index affdfe6..53418ed 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.3.0~ynh1" +version = "16.4.0~ynh1" maintainers = ["kay0u"] diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index eb8bd2e..e4bee4a 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,22 +1,22 @@ #!/bin/bash -gitlab_version="16.3.0" +gitlab_version="16.4.0" # 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="a8ad48f975a51edd47156a097554ad145cb6ca7458e7e2625a395db10c3a2e67" -gitlab_x86_64_bullseye_source_sha256="c768c9f82ffc5a9a11074970627c5f832eb416e5290ba878c7a4989900f1702a" -gitlab_x86_64_buster_source_sha256="89a5fb54f1e4ea27541e86e629916b5223db43c3582a52201d70f26fad649b52" +gitlab_x86_64_bookworm_source_sha256="f026ded6507866a8ef8ba22f6644ad183f83a435f4f9a798c7a6d57fb687330c" +gitlab_x86_64_bullseye_source_sha256="5fa3c5fa19d055f46a44d8f12e128315c758488971d11f9a89600ecba4ce9676" +gitlab_x86_64_buster_source_sha256="8b3850d09bb0e5c025c3048e344dabe739153e49a5f42946eb66d0f7de73686f" -gitlab_arm64_bookworm_source_sha256="04a1b984b1b29ffe4ce1cbc7b4bb7b206de70552f4322d3bc9a2013ae2c641ec" -gitlab_arm64_bullseye_source_sha256="05d418d7d736af480dea73955175bf1e2becdfdb1a7467e4e3ffa86b55b29f31" -gitlab_arm64_buster_source_sha256="96d0aebf79d0f8efd630ef4a05d9e48f7a4436e600fd24ad312da8d8527f285b" +gitlab_arm64_bookworm_source_sha256="85c56255204603cbd7286b41f21e0c1109375bb9ada8034009039ae3885e5b6c" +gitlab_arm64_bullseye_source_sha256="e5451d13632b142f582c68a82324941dff1a9fecedab4da0862d07b058dfb2f3" +gitlab_arm64_buster_source_sha256="60431671af22bc492d367a24089d17a864833bad464ab200156363e096716a95" gitlab_arm_bookworm_source_sha256="" -gitlab_arm_bullseye_source_sha256="50ca0bdc687bfab76cd117dcc9dffa6ce6496c00e962c4e8f21354f74ed952f3" -gitlab_arm_buster_source_sha256="2a4e6e6708e0310251e3af71d670861ab8b787a12c7916b25c79b54b373b4f87" +gitlab_arm_bullseye_source_sha256="cbba55eba613e4496580e127fcc37ba4d5034be0b3cc53136c718e3c469d772b" +gitlab_arm_buster_source_sha256="1739f29fdd49ef1805e567f4c967b28f98e7ce849b673fc1aac61200bee02a64" architecture=$(ynh_app_setting_get --app="$app" --key=architecture)