diff --git a/README.md b/README.md index d3cd6ca..947c6b7 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,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:** 15.10.2~ynh1 +**Shipped version:** 15.11.0~ynh1 **Demo:** https://gitlab.com/explore diff --git a/README_fr.md b/README_fr.md index 7c19954..b1823d4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD -**Version incluse :** 15.10.2~ynh1 +**Version incluse :** 15.11.0~ynh1 **Démo :** https://gitlab.com/explore diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 675f4f0..afadf9a 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -1435,6 +1435,7 @@ sidekiq['listen_port'] = __SIDEKIQ_PORT__ # redis['tcp_keepalive'] = "300" # redis['uid'] = nil # redis['gid'] = nil +# redis['startup_delay'] = 0 ### Redis TLS settings ###! To run Redis over TLS, specify values for the following settings @@ -1467,6 +1468,10 @@ sidekiq['listen_port'] = __SIDEKIQ_PORT__ #} # +###! Configure timeout (in seconds) for runit's sv commands used for managing +###! the Redis service +# redis['runit_sv_timeout'] = nil + ###! **To enable only Redis service in this machine, uncomment ###! one of the lines below (choose master or replica instance types).** ###! Docs: https://docs.gitlab.com/omnibus/settings/redis.html @@ -1697,6 +1702,7 @@ nginx['listen_https'] = false # logging['logrotate_method'] = "copytruncate" # see 'man logrotate' # logging['logrotate_postrotate'] = nil # no postrotate command by default # logging['logrotate_dateformat'] = nil # use date extensions for rotated files rather than numbers e.g. a value of "-%Y-%m-%d" would give rotated files like production.log-2016-03-09.gz +# logging['log_group'] = nil # assign this group to specified log directories and use it for runit-managed logs, can be overridden per-service ### UDP log forwarding ##! Docs: http://docs.gitlab.com/omnibus/settings/logs.html#udp-log-forwarding @@ -2463,6 +2469,7 @@ nginx['listen_https'] = false # gitaly['enable'] = true # gitaly['dir'] = "/var/opt/gitlab/gitaly" # gitaly['log_directory'] = "/var/log/gitlab/gitaly" +# gitaly['log_group'] = nil # gitaly['bin_path'] = "/opt/gitlab/embedded/bin/gitaly" # gitaly['env_directory'] = "/opt/gitlab/etc/gitaly/env" # gitaly['env'] = { diff --git a/manifest.json b/manifest.json index d5321e8..4077910 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "GitLab", "id": "gitlab", "packaging_format": 1, - "version": "15.10.2~ynh1", + "version": "15.11.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 c37f75e..4b0541f 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,18 +1,18 @@ #!/bin/bash -gitlab_version="15.10.2" +gitlab_version="15.11.0" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="$(lsb_release -sc)" -gitlab_x86_64_bullseye_source_sha256="ca165fd01cfbb3159b3e741b318cfa6365a3840d8d813538fee61f623594b0b4" -gitlab_x86_64_buster_source_sha256="2ec4c085ab48faa1f8a9fe334c01eaa63d75277fb1a35605a9d31259a3c074e1" +gitlab_x86_64_bullseye_source_sha256="af34ec336f4f2552fa0725a7b64f81693dc8fd1c61dece50de17d9698ec779f4" +gitlab_x86_64_buster_source_sha256="e68681a256d7c333894f6ae1d261945f782f44f0f3ee3b4f7bb5ca10f1eef4bf" -gitlab_arm64_bullseye_source_sha256="faeb39eed99b68409f5a518307791ac85e0a00f497b0616b0d16ad50b644d826" -gitlab_arm64_buster_source_sha256="6dd3920f929c15613d8013b1b184b6c3c9c291bfff735b0636007ccc25d34b65" +gitlab_arm64_bullseye_source_sha256="2c0f26c0b5733594f4b66a8934e543ab8707f0f59e807638ccd7d024e3cb4090" +gitlab_arm64_buster_source_sha256="9b83d92f6167b8cf5a28748ed29b06c2edd0f7d2005d1ae8f8f06ed69a70d9f8" -gitlab_arm_buster_source_sha256="ab1b8c5414b6f02205978d282b4db8acddc34379e19800d409bf5b69fe9f0ccd" -gitlab_arm_bullseye_source_sha256="4a26d508f5791497fc8a191c142e3725a7c04b4cc1fbfaf7033a706880298aa2" +gitlab_arm_buster_source_sha256="aa9423ae404df614911cbee432080837025d1a566967d1e0d5034d68b1c281cc" +gitlab_arm_bullseye_source_sha256="1d8a25012b380242defc3c87e33ce6434815fb8d4f9d92ebe5b891e1067ddd6d" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) @@ -37,16 +37,16 @@ elif [ "$architecture" = "arm" ]; then then # If the version for arm doesn't exist, then use an older one if [ -z "$gitlab_arm_buster_source_sha256" ]; then - gitlab_version="15.10.2" - gitlab_arm_buster_source_sha256="ab1b8c5414b6f02205978d282b4db8acddc34379e19800d409bf5b69fe9f0ccd" + gitlab_version="15.11.0" + gitlab_arm_buster_source_sha256="aa9423ae404df614911cbee432080837025d1a566967d1e0d5034d68b1c281cc" fi gitlab_source_sha256=$gitlab_arm_buster_source_sha256 elif [ "$gitlab_debian_version" = "buster" ] then # If the version for arm doesn't exist, then use an older one if [ -z "$gitlab_arm_bullseye_source_sha256" ]; then - gitlab_version="15.10.2" - gitlab_arm_bullseye_source_sha256="4a26d508f5791497fc8a191c142e3725a7c04b4cc1fbfaf7033a706880298aa2" + gitlab_version="15.11.0" + gitlab_arm_bullseye_source_sha256="1d8a25012b380242defc3c87e33ce6434815fb8d4f9d92ebe5b891e1067ddd6d" fi gitlab_source_sha256=$gitlab_arm_bullseye_source_sha256 fi