diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 6457426..f254655 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -1168,6 +1168,28 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ ##! Semantic metadata used when registering GitLab Workhorse as a Consul service # gitlab_workhorse['consul_service_meta'] = {} +##! Redis settings specific for GitLab Workhorse +##! To be used when Workhorse is supposed to use a different Redis instance than +##! other components. The settings specified here should match +##! `gitlab_rails['redis_workhorse_*']` settings, if specified. If not specified, +##! they are inferred from the below values. `gitlab_rails['redis_workhorse_*']` +##! settings tell the Rails app which Redis has channels to publish messages to, +##! and `gitlab_workhorse['redis_*']` tells Workhorse which Redis has channels to +##! subscribe to. Hence, the requirement of the settings to match. +# gitlab_workhorse['redis_socket'] = "/var/opt/gitlab/redis/redis.socket" +# gitlab_workhorse['redis_host'] = "127.0.0.1" +# gitlab_workhorse['redis_port'] = nil +# gitlab_workhorse['redis_database'] = nil +# gitlab_workhorse['redis_username'] = nil +# gitlab_workhorse['redis_password'] = nil +# gitlab_workhorse['redis_ssl'] = false +# gitlab_workhorse['redis_cluster_nodes'] = [] +# gitlab_workhorse['redis_sentinels'] = [] +# gitlab_workhorse['redis_sentinels_password'] = nil +# gitlab_workhorse['redis_sentinel_master'] = nil +# gitlab_workhorse['redis_sentinel_master_ip'] = nil +# gitlab_workhorse['redis_sentinel_master_port'] = nil + ################################################################################ ## GitLab User Settings ##! Modify default git user. @@ -1311,7 +1333,7 @@ sidekiq['listen_port'] = __PORT_SIDEKIQ__ ### Git trace log file. ###! If set, git commands receive GIT_TRACE* environment variables ###! Docs: https://git-scm.com/book/es/v2/Git-Internals-Environment-Variables#Debugging -###! An absolute path starting with / – the trace output will be appended to +###! An absolute path starting with / - the trace output will be appended to ###! that file. It needs to exist so we can check permissions and avoid ###! throwing warnings to the users. # gitlab_shell['git_trace_log_file'] = "/var/log/gitlab/gitlab-shell/gitlab-shell-git-trace.log" @@ -1947,6 +1969,7 @@ nginx['listen_https'] = false # gitlab_pages['internal_gitlab_server'] = nil # Defaults to gitlab_server, can be changed to internal load balancer # gitlab_pages['auth_secret'] = nil # Generated if not present # gitlab_pages['auth_scope'] = nil # Defaults to api, can be changed to read_api to increase security +# gitlab_pages['auth_timeout'] = "5s" # GitLab application client timeout for authentication # gitlab_pages['auth_cookie_session_timeout'] = "10m" # Authentication cookie session timeout (truncated to seconds). A zero value means the cookie will be deleted after the browser session ends ##! GitLab Pages Server Shutdown Timeout @@ -2046,6 +2069,9 @@ nginx['listen_https'] = false # 'SSL_CERT_DIR' => "#{node['package']['install-dir']}/embedded/ssl/certs/" # } +# Experimental - Enable namespace in path +# gitlab_pages['namespace_in_path'] = false + ################################################################################ ## GitLab Pages NGINX ################################################################################ @@ -2516,6 +2542,7 @@ nginx['listen_https'] = false # gitaly['dir'] = "/var/opt/gitlab/gitaly" # gitaly['log_group'] = nil # gitaly['bin_path'] = "/opt/gitlab/embedded/bin/gitaly" +# gitaly['use_wrapper'] = true # gitaly['env_directory'] = "/opt/gitlab/etc/gitaly/env" # gitaly['env'] = { # 'PATH' => "/opt/gitlab/bin:/opt/gitlab/embedded/bin:/bin:/usr/bin", @@ -2785,7 +2812,7 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__ ##! Note: We do not recommend changing these values unless absolutely necessary ##! Set to false to only parse secrets from `gitlab-secrets.json` file but not generate them. # package['generate_default_secrets'] = true -##! Set to false to prevent creating `gitlab-secrets.json` file +##! Set to false to prevent creating the default gitlab-secrets.json` file # package['generate_secrets_json_file'] = true ################################################################################ ################################################################################ @@ -3052,7 +3079,7 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__ ################################################################################ # Pgbouncer (EE only) -# See [GitLab PgBouncer documentation](http://docs.gitlab.com/omnibus/settings/database.html#enabling-pgbouncer-ee-only) +# See [GitLab PgBouncer documentation](https://docs.gitlab.com/ee/administration/postgresql/pgbouncer.html) # See the [PgBouncer page](https://pgbouncer.github.io/config.html) for details ################################################################################ # pgbouncer['enable'] = false @@ -3273,6 +3300,7 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__ # Consul (EE only) ################################################################################ # consul['enable'] = false +# consul['binary_path'] = '/opt/gitlab/embedded/bin/consul' # consul['dir'] = '/var/opt/gitlab/consul' # consul['username'] = 'gitlab-consul' # consul['group'] = 'gitlab-consul' diff --git a/manifest.toml b/manifest.toml index 1c6e707..2dce68c 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.6.2~ynh1" +version = "16.7.0~ynh1" maintainers = ["kay0u"] diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index f49e345..fa5bdce 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,22 +1,22 @@ #!/bin/bash -gitlab_version="16.6.2" +gitlab_version="16.7.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="8e0e621f0c18b534c945bf4781bbea6ac48f508be26716849a3846ea9d98f2c1" -gitlab_x86_64_bullseye_source_sha256="f8569113045c40f6b0dd444a0481b3fb3e9efb2220b500d630032bc9d5c174d2" -gitlab_x86_64_buster_source_sha256="9f7fdbee61d9036b1ed758babe1e4b16b25b6acee87b2fb9d0469e3862ab24a8" +gitlab_x86_64_bookworm_source_sha256="9d33fff0f783a279cbb584dd92efe05b66c28221b221bae46a415095e30e4ab1" +gitlab_x86_64_bullseye_source_sha256="59ba37669dae0ecb69186e82468ab73455d2e050e5e4ede04fe648bf2ed47961" +gitlab_x86_64_buster_source_sha256="115762553a695546e63dcb270f00ca5e8000e0bd08d676432c29b4d34c2b4e19" -gitlab_arm64_bookworm_source_sha256="2751902fd7c7771cc5be6c7ae20def7a24bd799da84932bba8dbdefcc0d17e06" -gitlab_arm64_bullseye_source_sha256="92ecf0f69c678aaba852981d39796dc4fcaa362898d5fda8cd1a6b7b87d8fd8e" -gitlab_arm64_buster_source_sha256="fcec664802fde786fe6cc4abd5c78ec9ec2ac005ebec111c3a8e9524dcfd4d56" +gitlab_arm64_bookworm_source_sha256="abc27b8c09247c3127f95977616b1811be101cf253c60cef5fdf7e4dbe698e09" +gitlab_arm64_bullseye_source_sha256="cc28d443d6292289172cba777ed9553d7f8804af2797bc504275909d313868f1" +gitlab_arm64_buster_source_sha256="6d67bf9b71cd34ea888e69c24e4ba22e56c183692edaadc63c8e71ea2970b178" gitlab_arm_bookworm_source_sha256="" -gitlab_arm_bullseye_source_sha256="018d91e057703057522ab95307a08b0104e7c2060a5840889d1a938793c261ef" -gitlab_arm_buster_source_sha256="435988134187f1f3414b4badd33993ecad21ee5ebec16521388b8099940541ef" +gitlab_arm_bullseye_source_sha256="f523966acb8b569e9aab7c5c112ea355383d16b7ff7ec4329d38ad467cd316be" +gitlab_arm_buster_source_sha256="751bdb877b3508c23d41860500e038ba1451e5c772aa01388d14287b3f6aa340" architecture=$(ynh_app_setting_get --app="$app" --key=architecture)