diff --git a/README.md b/README.md index 242a312..3b94fce 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features -**Shipped version:** 14.9.2~ynh1 +**Shipped version:** 14.10.0~ynh1 **Demo:** https://gitlab.com/explore diff --git a/README_fr.md b/README_fr.md index 15303e3..007fc86 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD -**Version incluse :** 14.9.2~ynh1 +**Version incluse :** 14.10.0~ynh1 **Démo :** https://gitlab.com/explore diff --git a/conf/gitlab.rb b/conf/gitlab.rb index f810b5d..9c967e4 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -728,7 +728,6 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # 'bantime' => 3600 # } -###! **We do not recommend changing these directories.** # gitlab_rails['dir'] = "/var/opt/gitlab/gitlab-rails" # gitlab_rails['log_directory'] = "/var/log/gitlab/gitlab-rails" @@ -782,6 +781,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # gitlab_rails['db_keepalives_count'] = nil # gitlab_rails['db_tcp_user_timeout'] = nil # gitlab_rails['db_application_name'] = nil +# gitlab_rails['db_database_tasks'] = true ### GitLab Redis settings @@ -1778,6 +1778,17 @@ nginx['listen_https'] = false # gitlab_pages['zip_cache_refresh'] = "30s" ##! The maximum amount of time it takes to open a zip archive from the file system or object storage. # gitlab_pages['zip_open_timeout'] = "30s" +##! Zip HTTP Client timeout +# gitlab_pages['zip_http_client_timeout'] = "30m" + +##! ReadTimeout is the maximum duration for reading the entire request, including the body. A zero or negative value means there will be no timeout. +# gitlab_pages['server_read_timeout'] = "5s" +##! ReadHeaderTimeout is the amount of time allowed to read request headers. A zero or negative value means there will be no timeout. +# gitlab_pages['server_read_header_timeout'] = "1s" +##! WriteTimeout is the maximum duration before timing out writes of the response. A zero or negative value means there will be no timeout. +# gitlab_pages['server_write_timeout'] = "5m" +##! KeepAlive specifies the keep-alive period for network connections accepted by this listener. If zero, keep-alives are enabled if supported by the protocol and operating system. If negative, keep-alives are disabled. +# gitlab_pages['server_keep_alive'] = "15s" ##! Enable serving content from disk instead of Object Storage # gitlab_pages['enable_disk'] = nil @@ -1843,9 +1854,9 @@ nginx['listen_https'] = false ##! Settings used by the GitLab application # gitlab_rails['gitlab_kas_enabled'] = true -# gitlab_rails['gitlab_kas_external_url'] = ws://gitlab.example.com/-/kubernetes-agent/ -# gitlab_rails['gitlab_kas_internal_url'] = grpc://localhost:8153 -# gitlab_rails['gitlab_kas_external_k8s_proxy_url'] = https://gitlab.example.com/-/kubernetes-agent/ +# gitlab_rails['gitlab_kas_external_url'] = 'ws://gitlab.example.com/-/kubernetes-agent/' +# gitlab_rails['gitlab_kas_internal_url'] = 'grpc://localhost:8153' +# gitlab_rails['gitlab_kas_external_k8s_proxy_url'] = 'https://gitlab.example.com/-/kubernetes-agent/' ##! Enable GitLab KAS # gitlab_kas['enable'] = true @@ -2318,10 +2329,7 @@ nginx['listen_https'] = false # 'WRAPPER_JSON_LOGGING' => true # } -##! internal_socket_dir is the directory that will contain internal gitaly sockets, -##! separate from socket_path which is the socket that external clients listen on - -# gitaly['internal_socket_dir'] = "/var/opt/gitlab/gitaly" +# gitaly['runtime_dir'] = "/var/opt/gitlab/gitaly/run" # gitaly['socket_path'] = "/var/opt/gitlab/gitaly/gitaly.socket" # gitaly['listen_addr'] = "localhost:8075" # gitaly['tls_listen_addr'] = "localhost:9075" @@ -2355,6 +2363,17 @@ nginx['listen_https'] = false # 'max_per_repo' => 5 # } # ] +# gitaly['rate_limiting'] = [ +# { +# 'rpc' => "/gitaly.SmartHTTPService/PostReceivePack", +# 'interval' => '1m', +# 'burst' => 10 +# }, { +# 'rpc' => "/gitaly.SSHService/SSHUploadPack", +# 'interval' => '1m', +# 'burst' => 5 +# } +# ] # # gitaly['daily_maintenance_start_hour'] = 22 # gitaly['daily_maintenance_start_minute'] = 30 @@ -2725,6 +2744,7 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__ # geo_secondary['db_sslrootcert'] = nil # geo_secondary['db_sslca'] = nil # geo_secondary['db_prepared_statements'] = false +# geo_secondary['db_database_tasks'] = true ################################################################################ ## GitLab Geo Secondary Tracking Database (EE only) @@ -2737,6 +2757,13 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__ # geo_postgresql['pgbouncer_user_password'] = nil ##! `SQL_USER_PASSWORD_HASH` can be generated using the command `gitlab-ctl pg-password-md5 gitlab` # geo_postgresql['sql_user_password'] = 'SQL_USER_PASSWORD_HASH' +# geo_postgresql['log_directory'] = '/var/log/gitlab/geo-postgresql' + +################################################################################ +## GitLab Geo Log Cursor Daemon (EE only) +################################################################################ + +# geo_logcursor['log_directory'] = '/var/log/gitlab/geo-logcursor' ################################################################################ ## Unleash diff --git a/manifest.json b/manifest.json index cd9d26a..e114513 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "GitLab", "id": "gitlab", "packaging_format": 1, - "version": "14.9.2~ynh1", + "version": "14.10.0~ynh1", "description": { "en": "Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features", "fr": "Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD" diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 4dd2984..084d47e 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,17 +1,17 @@ #!/bin/bash -gitlab_version="14.9.2" +gitlab_version="14.10.0" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="$(lsb_release -sc)" -gitlab_x86_64_bullseye_source_sha256="4a9b94edcd97f09198aeb8f64d973f0a892f6554d18afedf688ae9d1ca21e9b3" -gitlab_x86_64_buster_source_sha256="f51e05dd6d352a5b5c13e174ddf70c71c60109140b9274b77ae63c61eb701611" +gitlab_x86_64_bullseye_source_sha256="6f7a1ba6c263f0eaeee909a2c3134b894aae3c203de37d7e2ebffd67e9949619" +gitlab_x86_64_buster_source_sha256="85489ced3b9ae2ba87c6e76c4fcb0a5cf0b6f93cf302ab22bb73e50ba233aa19" -gitlab_arm64_bullseye_source_sha256="7826fad61eae70138ff06a33b3471466a11c5237c0960daecde1b94a3e694265" -gitlab_arm64_buster_source_sha256="6b4493b2d55ad6cd796036324dd1953e58ecb7ccf80dc4d02f5a4dbf0d56c8b8" +gitlab_arm64_bullseye_source_sha256="4b47d2acd4adc2f11217e162559cb128b32961a88d3aecd668847077f83d6a37" +gitlab_arm64_buster_source_sha256="611f7a3184d1708cc1ad1d271e76104f1e3ec56e92bcf4bcb164760bd87b83dc" -gitlab_arm_buster_source_sha256="38033ef2cfcf23e466795a3630645a45cbc1ca771d4273e29398ec7641255ef1" +gitlab_arm_buster_source_sha256="da62ffd3aba70b37f583a78000ecb0eeab774fe7e5de437e8823bd45b375ba02" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) @@ -34,8 +34,8 @@ elif [ "$architecture" = "arm64" ]; then elif [ "$architecture" = "arm" ]; then # If the version for arm doesn't exist, then use an older one if [ -z "$gitlab_arm_buster_source_sha256" ]; then - gitlab_version="14.9.2" - gitlab_arm_buster_source_sha256="38033ef2cfcf23e466795a3630645a45cbc1ca771d4273e29398ec7641255ef1" + gitlab_version="14.10.0" + gitlab_arm_buster_source_sha256="da62ffd3aba70b37f583a78000ecb0eeab774fe7e5de437e8823bd45b375ba02" fi gitlab_source_sha256=$gitlab_arm_buster_source_sha256 fi