From 9f7338fabf8a1a12ed63903b1a4e1425bbca967b Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 2 Feb 2024 08:13:34 +0100 Subject: [PATCH 1/3] 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) From 912af42f418f8b721b64545a26a2b58b85349d5a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 2 Feb 2024 07:13:43 +0000 Subject: [PATCH 2/3] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 81ce10c..a87a59c 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:** 16.7.3~ynh1 +**Shipped version:** 16.8.1~ynh1 **Demo:** https://gitlab.com/explore diff --git a/README_fr.md b/README_fr.md index dee0d12..fe3111d 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 :** 16.7.3~ynh1 +**Version incluse :** 16.8.1~ynh1 **Démo :** https://gitlab.com/explore From 121606a32c4cc57d8382d8481a6818f2989e3873 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 2 Feb 2024 18:04:51 +0100 Subject: [PATCH 3/3] update upgrade path --- scripts/upgrade.d/upgrade.16.3.sh | 14 +++---- scripts/upgrade.d/upgrade.16.7.sh | 55 +++++++++++++++++++++++++++ scripts/upgrade.d/upgrade.16.first.sh | 14 +++---- 3 files changed, 69 insertions(+), 14 deletions(-) create mode 100644 scripts/upgrade.d/upgrade.16.7.sh diff --git a/scripts/upgrade.d/upgrade.16.3.sh b/scripts/upgrade.d/upgrade.16.3.sh index 8cc5a41..a515504 100644 --- a/scripts/upgrade.d/upgrade.16.3.sh +++ b/scripts/upgrade.d/upgrade.16.3.sh @@ -1,18 +1,18 @@ #!/bin/bash -gitlab_version="16.3.5" +gitlab_version="16.3.7" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="$(lsb_release -sc)" -gitlab_x86_64_bullseye_source_sha256="80bf49ae846133f7a19267b494024a4010e64839829262ef5241f1fb585dc60c" -gitlab_x86_64_buster_source_sha256="ae216aa3e1831b928fe8a0a543cc3734e3ac3d6191d7eb5111f061f38b67e36c" +gitlab_x86_64_bullseye_source_sha256="4e702837d3e2add5a129ffb11828b53e17cbe4d8f1d33f748de52f869ec0d142" +gitlab_x86_64_buster_source_sha256="21e18b883189b670ab1c67cc5cc9b238ad1b101e0caed2618183f440e795dff6" -gitlab_arm64_bullseye_source_sha256="e38a2347f1b0c6af3dcac5cc5746b37db7059c9e8d4c82efaa90bcc7f8532f4e" -gitlab_arm64_buster_source_sha256="98bf7cc6ad9c339d90f6fd3e6ad90431b14c9817269278a5de6eff6a652264ca" +gitlab_arm64_bullseye_source_sha256="9189a30575b2d5a51a2304307c46eb4e5924cec1fbe0344b24715eae417976b7" +gitlab_arm64_buster_source_sha256="d4197c6b76141939d2cfa7770f1723203564debd31b366762fc125d92babb2f2" -gitlab_arm_buster_source_sha256="b4fe665d35674a641755eb5d966cd4b05877c9149ba27a629960e82465432dda" -gitlab_arm_bullseye_source_sha256="b37e5318c90822d2ded46b604f7976c8b4a54764df5c937d48d6360d864531fe" +gitlab_arm_buster_source_sha256="57d0934b4c603aac247a013fa4226a362684c8e7e9595359e6c858bf2f461443" +gitlab_arm_bullseye_source_sha256="b311a008bae9a4ff23568bac847bf0e4571d201bc65ff305d58e7121b5bebd49" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) diff --git a/scripts/upgrade.d/upgrade.16.7.sh b/scripts/upgrade.d/upgrade.16.7.sh new file mode 100644 index 0000000..91e4b76 --- /dev/null +++ b/scripts/upgrade.d/upgrade.16.7.sh @@ -0,0 +1,55 @@ +#!/bin/bash + +gitlab_version="16.7.4" + +# sha256sum found here: https://packages.gitlab.com/gitlab +gitlab_debian_version="$(lsb_release -sc)" + +gitlab_x86_64_bullseye_source_sha256="f5a4771960395864b199cad65dd196f542a47cd98f6caa164aecfc2bd2e919aa" +gitlab_x86_64_buster_source_sha256="2e4c1caffce05164a79c530bc51fd654145b07d0539fa34e869e59bc9b10932b" + +gitlab_arm64_bullseye_source_sha256="99e9ba4588df220f06c23e265921664067c0133bd38179077ff350fdbfeaf0ce" +gitlab_arm64_buster_source_sha256="da0c5d57eb54f3eb3a6690e4bc6eae05251871aa3a6bb41d523eca94e95a4765" + +gitlab_arm_buster_source_sha256="bc8190866e5e2ebe67a63f04614405b83e41b54aab8c8ca3fb50bfd7f0cc2196" +gitlab_arm_bullseye_source_sha256="63735b16dfa5825dfb92685565faec5274a3f38497494520a6142a3edf3dc298" + +architecture=$(ynh_app_setting_get --app="$app" --key=architecture) + +if [ "$architecture" = "x86-64" ]; then + if [ "$gitlab_debian_version" = "bullseye" ] + then + gitlab_source_sha256=$gitlab_x86_64_bullseye_source_sha256 + elif [ "$gitlab_debian_version" = "buster" ] + then + gitlab_source_sha256=$gitlab_x86_64_buster_source_sha256 + fi +elif [ "$architecture" = "arm64" ]; then + if [ "$gitlab_debian_version" = "bullseye" ] + then + gitlab_source_sha256=$gitlab_arm64_bullseye_source_sha256 + elif [ "$gitlab_debian_version" = "buster" ] + then + gitlab_source_sha256=$gitlab_arm64_buster_source_sha256 + fi +elif [ "$architecture" = "arm" ]; then + if [ "$gitlab_debian_version" = "bullseye" ] + then + gitlab_source_sha256=$gitlab_arm_bullseye_source_sha256 + elif [ "$gitlab_debian_version" = "buster" ] + then + gitlab_source_sha256=$gitlab_arm_buster_source_sha256 + fi +fi + +gitlab_filename="gitlab-ce-${gitlab_version}.deb" + +# Action to do in case of failure of the package_check +package_check_action() { + ynh_backup_if_checksum_is_different --file="$config_path/gitlab.rb" + cat <> "$config_path/gitlab.rb" +# Last chance to fix Gitlab +package['modify_kernel_parameters'] = false +EOF + ynh_store_file_checksum --file="$config_path/gitlab.rb" +} diff --git a/scripts/upgrade.d/upgrade.16.first.sh b/scripts/upgrade.d/upgrade.16.first.sh index 07c9c25..e2475d8 100644 --- a/scripts/upgrade.d/upgrade.16.first.sh +++ b/scripts/upgrade.d/upgrade.16.first.sh @@ -1,18 +1,18 @@ #!/bin/bash -gitlab_version="16.1.5" +gitlab_version="16.1.6" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="$(lsb_release -sc)" -gitlab_x86_64_bullseye_source_sha256="da5a3eac413c2c1646bdec1fceed170fb0c77f4ebb61beae16fb2d84e3d14d63" -gitlab_x86_64_buster_source_sha256="f74e92fe2ebfc31d2b04aff606876cf3881912ef10ccf440ca74c486059f41dd" +gitlab_x86_64_bullseye_source_sha256="482f1fef771939a9369f5be06ac8800b9b37562fd4569656f38ebe93705a7f74" +gitlab_x86_64_buster_source_sha256="f800972861c42870c41ca005e5a068130d72cce32d20b71777725866582b7e0b" -gitlab_arm64_bullseye_source_sha256="d6a660b057cf7621d6edd01458790b49582abe54d0e8b69024d37380d3d8a6ab" -gitlab_arm64_buster_source_sha256="370f54e6a14732397ecd050b3e582ee766cb43475c08da56516e77de20af1d1f" +gitlab_arm64_bullseye_source_sha256="b68658cd488a459300bb546796a8ac84702c89cf7ad31ead4a28c7b8d2b1a655" +gitlab_arm64_buster_source_sha256="af1a03f3b11c95a9466df27742b32106be2cafa0d56697122d7d4cf2a8dcfd18" -gitlab_arm_buster_source_sha256="0ce903f3bd83ee7aa5e12649422ce42f75700167564c008fa2a57f831c42f55e" -gitlab_arm_bullseye_source_sha256="ead7cec3a747d30ca20fb251f07c42636a86a3f35eae4d5ebebc8a20f8843832" +gitlab_arm_buster_source_sha256="a688b26a70a4e51860770517dc773d1b046f33f93deb14687b7a2dc263e5ed82" +gitlab_arm_bullseye_source_sha256="665e096669c7af0ae692ff7da8766dc47579b93664f18387765e8f947b1bc276" architecture=$(ynh_app_setting_get --app="$app" --key=architecture)