From e68580eb2e5f21f94434d188454ceb83a7f7c8ff Mon Sep 17 00:00:00 2001 From: Kay0u Date: Mon, 29 Jul 2024 01:35:35 +0200 Subject: [PATCH 1/2] 17.2.1 --- conf/gitlab.rb | 23 +++++++++++++++++++++-- manifest.toml | 2 +- scripts/upgrade.d/upgrade.last.sh | 18 +++++++++--------- 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 4a8905d..61de64a 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -211,6 +211,8 @@ external_url '__GENERATED_EXTERNAL_URL__' # gitlab_rails['ci_runner_versions_reconciliation_worker_cron'] = "@daily" # gitlab_rails['ci_runners_stale_machines_cleanup_worker_cron'] = "36 * * * *" # gitlab_rails['ci_catalog_resources_process_sync_events_worker_cron'] = "*/1 * * * *" +# gitlab_rails['ci_click_house_finished_pipelines_sync_worker_cron'] = "*/4 * * * *" +# gitlab_rails['ci_click_house_finished_pipelines_sync_worker_args'] = [1] ### Webhook Settings ###! Number of seconds to wait for HTTP response after sending webhook HTTP POST @@ -850,6 +852,9 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # gitlab_rails['redis_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem' # gitlab_rails['redis_tls_client_cert_file'] = nil # gitlab_rails['redis_tls_client_key_file'] = nil +# gitlab_rails['redis_connect_timeout'] = nil +# gitlab_rails['redis_read_timeout'] = nil +# gitlab_rails['redis_write_timeout'] = nil #### Redis local UNIX socket (will be disabled if TCP method is used) # gitlab_rails['redis_socket'] = "/var/opt/gitlab/redis/redis.socket" @@ -1080,7 +1085,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ ### Registry garbage collection ###! Docs: https://gitlab.com/gitlab-org/container-registry/-/blob/master/docs/configuration.md?ref_type=heads#gc -# registry['gc'] = { +# registry['gc'] = { # 'disabled' => false, # 'maxbackoff' => '24h', # 'noidlebackoff' => false, @@ -1398,6 +1403,8 @@ sidekiq['listen_port'] = __PORT_SIDEKIQ__ ##! **We do not recommend changing this directory.** # gitlab_shell['dir'] = "/var/opt/gitlab/gitlab-shell" +# gitlab_shell['lfs_pure_ssh_protocol'] = false + ################################################################################ ## gitlab-sshd ################################################################################ @@ -1422,6 +1429,9 @@ sidekiq['listen_port'] = __PORT_SIDEKIQ__ # gitlab_sshd['ciphers'] = nil # gitlab_sshd['kex_algorithms'] = nil # gitlab_sshd['macs'] = nil +##! A list of the to be accepted public key algorithms. +##! For example: %w(ssh-ed25519 ecdsa-sha2-nistp256 rsa-sha2-256 rsa-sha2-512) +# gitlab_sshd['public_key_algorithms'] = nil # gitlab_sshd['login_grace_time'] = 60 # gitlab_sshd['host_keys_dir'] = '/var/opt/gitlab/gitlab-sshd' # gitlab_sshd['host_keys_glob'] = 'ssh_host_*_key' @@ -1836,7 +1846,7 @@ nginx['listen_https'] = false # nginx['cache_max_size'] = '5000m' # nginx['server_names_hash_bucket_size'] = 64 ##! These paths have proxy_request_buffering disabled -# nginx['request_buffering_off_path_regex'] = "/api/v\\d/jobs/\\d+/artifacts$|/import/gitlab_project$|\\.git/git-receive-pack$|\\.git/gitlab-lfs/objects|\\.git/info/lfs/objects/batch$" +# nginx['request_buffering_off_path_regex'] = "/api/v\\d/jobs/\\d+/artifacts$|/import/gitlab_project$|\\.git/git-receive-pack$|\\.git/ssh-receive-pack$|\\.git/ssh-upload-pack$|\\.git/gitlab-lfs/objects|\\.git/info/lfs/objects/batch$" ### Nginx status # nginx['status'] = { @@ -3529,4 +3539,13 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__ # crond['cron_d'] = '/var/opt/gitlab/crond' # crond['flags'] = {} +#### +# gitlab-backup-cli settings +#### +# gitlab_backup_cli['enable'] = false +# gitlab_backup_cli['user'] = 'gitlab-backup' +# gitlab_backup_cli['group'] = 'gitlab-backup' +# gitlab_backup_cli['dir'] = '/var/opt/gitlab/backups' +# gitlab_backup_cli['additional_groups'] = %w[git gitlab-psql registry] + from_file '/etc/gitlab/gitlab-persistent.rb' diff --git a/manifest.toml b/manifest.toml index 29c9752..bc2ca97 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 = "17.1.2~ynh1" +version = "17.2.1~ynh1" maintainers = ["kay0u"] diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index c63b19b..6f7e12a 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,22 +1,22 @@ #!/bin/bash -gitlab_version="17.1.2" +gitlab_version="17.2.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="a850a4fc326ceabd2da3c687ef076bdfb86a212134ed41d9f87a87406a1bd0cf" -gitlab_x86_64_bullseye_source_sha256="652eaaf440b9729cc8a09da1982a1fac177ab425ed94ca6f78944f5bd42eaf9f" -gitlab_x86_64_buster_source_sha256="f50136bdd32781a89238adbc6456b43c72f74235bb3e21c4c5005549f5f54508" +gitlab_x86_64_bookworm_source_sha256="3f6eda84728380787bff751b76cb5ddaffe7f07376ba873de8e33865fc5b671e" +gitlab_x86_64_bullseye_source_sha256="6a82c30d61683ae51cc7442d45d5dcb880ea9343857cf3c59a3aa52fa964eb57" +gitlab_x86_64_buster_source_sha256="0f89798b7df3a904d454238926d1accf9b71b543f2b8c7113d42061bcf342a13" -gitlab_arm64_bookworm_source_sha256="dd893cd820902c3b82abb1feace7dc68824cfadbd2175c0ef0a0f1ec12dca5da" -gitlab_arm64_bullseye_source_sha256="a4f317b6750708dd9be0ee3cee0109bc44fb003df48e02a066af7b7433ff6053" -gitlab_arm64_buster_source_sha256="e3dfef1873d6a6caf802ea9c6d662b95c4f71c7cd1dce11b5b6e7c64c32109c5" +gitlab_arm64_bookworm_source_sha256="39ca066d25ca23642bb7d6e1a6df4dcfeefa6638a3e33127b2969b243984eb13" +gitlab_arm64_bullseye_source_sha256="cc7b86ca2fd3b72c8f14c57d5b4742b82fc7db24de217c1072076218654bca5f" +gitlab_arm64_buster_source_sha256="fc6893c6c545551886db6800f85dd2bd7c135e5a09fdd78d86305b90a4f67fd1" gitlab_arm_bookworm_source_sha256="" -gitlab_arm_bullseye_source_sha256="ac1fd6d947f88208fe8b0439c4574d117a9ad4fdfd18d5f934d981672c15465e" -gitlab_arm_buster_source_sha256="1f2f8d497a29fd0552188920616cf60896157fca99d08af6e365c99d3cd1953d" +gitlab_arm_bullseye_source_sha256="cd3d23bca99147a47485e061c04b28fc8784db05cadccb1d044ba2e95a13dd55" +gitlab_arm_buster_source_sha256="d1cc0e2327a3ebd9a08adec1f3d3ab3b48daf2c0eb61fb737635130e94e3bce7" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) From 2c9b4fd2240318acbd396535265d201476ee7151 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 28 Jul 2024 23:36:35 +0000 Subject: [PATCH 2/2] Auto-update READMEs --- ALL_README.md | 1 + README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 2 +- 8 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 README_id.md diff --git a/ALL_README.md b/ALL_README.md index 152f2e7..4ed64dd 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -5,4 +5,5 @@ - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) +- [Baca README dalam bahasa bahasa Indonesia](README_id.md) - [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 931225b..bb3d0a5 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ It shall NOT be edited by hand. Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features -**Shipped version:** 17.1.2~ynh1 +**Shipped version:** 17.2.1~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 9117906..4693a63 100644 --- a/README_es.md +++ b/README_es.md @@ -18,7 +18,7 @@ No se debe editar a mano. Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features -**Versión actual:** 17.1.2~ynh1 +**Versión actual:** 17.2.1~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index f1119c6..ce4d9f0 100644 --- a/README_eu.md +++ b/README_eu.md @@ -18,7 +18,7 @@ EZ editatu eskuz. Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features -**Paketatutako bertsioa:** 17.1.2~ynh1 +**Paketatutako bertsioa:** 17.2.1~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 347a447..557bf57 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main. Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD -**Version incluse :** 17.1.2~ynh1 +**Version incluse :** 17.2.1~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 01feddb..d81616e 100644 --- a/README_gl.md +++ b/README_gl.md @@ -18,7 +18,7 @@ NON debe editarse manualmente. Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features -**Versión proporcionada:** 17.1.2~ynh1 +**Versión proporcionada:** 17.2.1~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md new file mode 100644 index 0000000..0644652 --- /dev/null +++ b/README_id.md @@ -0,0 +1,49 @@ + + +# GitLab untuk YunoHost + +[![Tingkat integrasi](https://dash.yunohost.org/integration/gitlab.svg)](https://ci-apps.yunohost.org/ci/apps/gitlab/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/gitlab.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/gitlab.maintain.svg) + +[![Pasang GitLab dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=gitlab) + +*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)* + +> *Paket ini memperbolehkan Anda untuk memasang GitLab secara cepat dan mudah pada server YunoHost.* +> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.* + +## Ringkasan + +Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features + +**Versi terkirim:** 17.2.1~ynh1 + +**Demo:** + +## Tangkapan Layar + +![Tangkapan Layar pada GitLab](./doc/screenshots/GitLab_running_11.0_(2018-07).png) + +## Dokumentasi dan sumber daya + +- Website aplikasi resmi: +- Dokumentasi admin resmi: +- Depot kode aplikasi hulu: +- Gudang YunoHost: +- Laporkan bug: + +## Info developer + +Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/gitlab_ynh/tree/testing). + +Untuk mencoba branch `testing`, silakan dilanjutkan seperti: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/gitlab_ynh/tree/testing --debug +atau +sudo yunohost app upgrade gitlab -u https://github.com/YunoHost-Apps/gitlab_ynh/tree/testing --debug +``` + +**Info lebih lanjut mengenai pemaketan aplikasi:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index a12b99a..be0be3a 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -18,7 +18,7 @@ Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features -**分发版本：** 17.1.2~ynh1 +**分发版本：** 17.2.1~ynh1 **演示：**