diff --git a/conf/gitlab.rb b/conf/gitlab.rb index e481359..3629f8a 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -54,7 +54,7 @@ external_url '__GENERATED_EXTERNAL_URL__' ##! redis_sentinel_role redis_master_role redis_replica_role geo_primary_role geo_secondary_role ##! postgres_role consul_role application_role monitoring_role ##! For more details on each role, see: -##! https://docs.gitlab.com/omnibus/roles/README.html#roles +##! https://docs.gitlab.com/omnibus/roles/index.html#roles ##! # roles ['redis_sentinel_role', 'redis_master_role'] @@ -177,7 +177,7 @@ external_url '__GENERATED_EXTERNAL_URL__' ###! Periodically executed jobs, to self-heal Gitlab, do external ###! synchronizations, etc. ###! Docs: https://github.com/ondrejbartas/sidekiq-cron#adding-cron-job -###! https://docs.gitlab.com/ee/ci/yaml/README.html#artifactsexpire_in +###! https://docs.gitlab.com/ee/ci/yaml/index.html#artifactsexpire_in # gitlab_rails['stuck_ci_jobs_worker_cron'] = "0 0 * * *" # gitlab_rails['expire_build_artifacts_worker_cron'] = "*/7 * * * *" # gitlab_rails['environments_auto_stop_cron_worker_cron'] = "24 * * * *" @@ -1857,7 +1857,7 @@ nginx['listen_https'] = false ################################################################################ ## GitLab CI -##! Docs: https://docs.gitlab.com/ee/ci/quick_start/README.html +##! Docs: https://docs.gitlab.com/ee/ci/quick_start/ ################################################################################ # gitlab_ci['gitlab_ci_all_broken_builds'] = true @@ -2371,6 +2371,7 @@ nginx['listen_https'] = false # gitaly['tls_listen_addr'] = "localhost:9075" # gitaly['certificate_path'] = "/var/opt/gitlab/gitaly/certificate.pem" # gitaly['key_path'] = "/var/opt/gitlab/gitaly/key.pem" +# gitaly['gpg_signing_key_path'] = "/var/opt/gitlab/gitaly/signing_key.gpg" # gitaly['prometheus_listen_addr'] = "localhost:9236" # gitaly['logging_level'] = "warn" # gitaly['logging_format'] = "json" @@ -2746,7 +2747,7 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__ ##! Docs: https://docs.gitlab.com/ee/gitlab-geo ################################################################################ ##! Geo roles 'geo_primary_role' and 'geo_secondary_role' are set above with -##! other roles. For more information, see: https://docs.gitlab.com/omnibus/roles/README.html#roles. +##! other roles. For more information, see: https://docs.gitlab.com/omnibus/roles/index.html#roles. # This is an optional identifier which Geo nodes can use to identify themselves. # For example, if external_url is the same for two secondaries, you must specify @@ -3063,12 +3064,7 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__ # } # } # } -# consul['watchers'] = { -# 'postgresql' => { -# enable: false, -# handler: 'failover_pgbouncer' -# } -# } +# consul['watchers'] = [] # # consul['custom_config_dir'] = '/path/to/service/configs/directory' # diff --git a/manifest.json b/manifest.json index 9ff7d0b..df17c0d 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "GitLab", "id": "gitlab", "packaging_format": 1, - "version": "15.3.3~ynh1", + "version": "15.4.1~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 d6167c7..d62c548 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,17 +1,17 @@ #!/bin/bash -gitlab_version="15.3.3" +gitlab_version="15.4.1" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="$(lsb_release -sc)" -gitlab_x86_64_bullseye_source_sha256="ee9a156d49daeca1e5901562e9c0e966b1b9b03379688b466ceb5cac8217632f" -gitlab_x86_64_buster_source_sha256="1f20c8f67119a5025fbc7e0f39a7c936cdbe20cdc7d9dcecf987419e2a3b5e36" +gitlab_x86_64_bullseye_source_sha256="0136f97d3a8db2dfb85e7fffe1248a5aa1f61b2b142910225f98e9d570dd497b" +gitlab_x86_64_buster_source_sha256="0099e3876388ade063f88aa720b9208f389a168eb093c68ab07ffbc93b3fe910" -gitlab_arm64_bullseye_source_sha256="d6cbcd4a7d552da0db0c7668eb7815c32894772b74cbb6c4f2d567243c16f25a" -gitlab_arm64_buster_source_sha256="d03c4d5b5cf3d007593c69c73d82ec1d0ee33927dca9acf789756aca01ef7268" +gitlab_arm64_bullseye_source_sha256="5481b71f9b561362d468ad1e53afec7c77a8251404cd0053848f66a8e2e17656" +gitlab_arm64_buster_source_sha256="40d4c07d1c281a8d1dcf3794e715090514c7b627557245e879ec79c22d7efb27" -gitlab_arm_buster_source_sha256="41fbc6658e33430f230a34e4b8ac226b5d97aed02fbd386a3cc737cbe07bd95b" +gitlab_arm_buster_source_sha256="e7febd850d745fa459bb9b02ebad74b7cba4541cb73e3ac7cedc55cbca2b40b2" 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="15.3.3" - gitlab_arm_buster_source_sha256="41fbc6658e33430f230a34e4b8ac226b5d97aed02fbd386a3cc737cbe07bd95b" + gitlab_version="15.4.1" + gitlab_arm_buster_source_sha256="e7febd850d745fa459bb9b02ebad74b7cba4541cb73e3ac7cedc55cbca2b40b2" fi gitlab_source_sha256=$gitlab_arm_buster_source_sha256 fi