diff --git a/ALL_README.md b/ALL_README.md index 4ed64dd..e3c80d2 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -6,4 +6,5 @@ - [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_ru.md) - [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index bb3d0a5..17026cb 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.2.1~ynh1 +**Shipped version:** 17.3.1~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 4693a63..698e0b7 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.2.1~ynh1 +**Versión actual:** 17.3.1~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index ce4d9f0..9801d94 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.2.1~ynh1 +**Paketatutako bertsioa:** 17.3.1~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 557bf57..44e53a0 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.2.1~ynh1 +**Version incluse :** 17.3.1~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index d81616e..67fa760 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.2.1~ynh1 +**Versión proporcionada:** 17.3.1~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md index 0644652..7e70503 100644 --- a/README_id.md +++ b/README_id.md @@ -18,7 +18,7 @@ Ini TIDAK boleh diedit dengan tangan. Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features -**Versi terkirim:** 17.2.1~ynh1 +**Versi terkirim:** 17.3.1~ynh1 **Demo:** diff --git a/README_ru.md b/README_ru.md new file mode 100644 index 0000000..5cbf03c --- /dev/null +++ b/README_ru.md @@ -0,0 +1,49 @@ + + +# GitLab для YunoHost + +[![Уровень интеграции](https://dash.yunohost.org/integration/gitlab.svg)](https://ci-apps.yunohost.org/ci/apps/gitlab/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/gitlab.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/gitlab.maintain.svg) + +[![Установите GitLab с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=gitlab) + +*[Прочтите этот README на других языках.](./ALL_README.md)* + +> *Этот пакет позволяет Вам установить GitLab быстро и просто на YunoHost-сервер.* +> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.* + +## Обзор + +Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features + +**Поставляемая версия:** 17.3.1~ynh1 + +**Демо-версия:** + +## Снимки экрана + +![Снимок экрана GitLab](./doc/screenshots/GitLab_running_11.0_(2018-07).png) + +## Документация и ресурсы + +- Официальный веб-сайт приложения: +- Официальная документация администратора: +- Репозиторий кода главной ветки приложения: +- Магазин YunoHost: +- Сообщите об ошибке: + +## Информация для разработчиков + +Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/gitlab_ynh/tree/testing). + +Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/gitlab_ynh/tree/testing --debug +или +sudo yunohost app upgrade gitlab -u https://github.com/YunoHost-Apps/gitlab_ynh/tree/testing --debug +``` + +**Больше информации о пакетировании приложений:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index be0be3a..8303be0 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.2.1~ynh1 +**分发版本：** 17.3.1~ynh1 **演示：** diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 61de64a..a3bba84 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -166,7 +166,7 @@ external_url '__GENERATED_EXTERNAL_URL__' # gitlab_rails['gitlab_default_projects_features_container_registry'] = true ### Automatic issue closing -###! See https://docs.gitlab.com/ee/customization/issue_closing.html for more +###! See https://docs.gitlab.com/ee/administration/issue_closing_pattern.html for more ###! information about this pattern. # gitlab_rails['gitlab_issue_closing_pattern'] = "\b((?:[Cc]los(?:e[sd]?|ing)|\b[Ff]ix(?:e[sd]|ing)?|\b[Rr]esolv(?:e[sd]?|ing)|\b[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)" @@ -704,7 +704,7 @@ EOS # gitlab_rails['backup_storage_class'] = 'STANDARD' ###! Skip parts of the backup. Comma separated. -###! Docs: https://docs.gitlab.com/ee/administration/backup_restore/backup_gitlab.html#excluding-specific-directories-from-the-backup +###! Docs: https://docs.gitlab.com/ee/administration/backup_restore/backup_gitlab.html#excluding-specific-data-from-the-backup #gitlab_rails['env'] = { # "SKIP" => "db,uploads,repositories,builds,artifacts,lfs,registry,pages" #} @@ -731,7 +731,7 @@ EOS # gitlab_rails['encrypted_settings_path'] = '/var/opt/gitlab/gitlab-rails/shared/encrypted_settings' ### Wait for file system to be mounted -###! Docs: https://docs.gitlab.com/omnibus/settings/configuration.html#only-start-omnibus-gitlab-services-after-a-given-file-system-is-mounted +###! Docs: https://docs.gitlab.com/omnibus/settings/configuration.html#start-linux-package-installation-services-only-after-a-given-file-system-is-mounted # high_availability['mountpoint'] = ["/var/opt/gitlab/git-data", "/var/opt/gitlab/gitlab-rails/shared"] ### GitLab Shell settings for GitLab @@ -1060,7 +1060,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # } ### Registry database -###! Docs: https://docs.gitlab.com/ee/administration/packages/container_registry.html?tab=Linux+package+%28Omnibus%29#configure-a-metadata-database-for-the-container-registry +###! Docs: https://docs.gitlab.com/ee/administration/packages/container_registry_metadata_database.html#new-installations # registry['database'] = { # 'enabled' => true, # 'host' => 'localhost', @@ -1335,7 +1335,7 @@ puma['port'] = __PORT_PUMA__ ##! GitLab allows one to start multiple sidekiq processes. These ##! processes can be used to consume a dedicated set of queues. This ##! can be used to ensure certain queues are able to handle additional workload. -##! https://docs.gitlab.com/ee/administration/operations/extra_sidekiq_processes.html +##! https://docs.gitlab.com/ee/administration/sidekiq/extra_sidekiq_processes.html # sidekiq['enable'] = true # sidekiq['log_directory'] = "/var/log/gitlab/sidekiq" @@ -1394,7 +1394,7 @@ sidekiq['listen_port'] = __PORT_SIDEKIQ__ ### Git trace log file. ###! If set, git commands receive GIT_TRACE* environment variables -###! Docs: https://git-scm.com/book/es/v2/Git-Internals-Environment-Variables#Debugging +###! Docs: https://git-scm.com/book/en/v2/Git-Internals-Environment-Variables#_debugging ###! An absolute path starting with / - the trace output will be appended to ###! that file. It needs to exist so we can check permissions and avoid ###! throwing warnings to the users. @@ -1456,6 +1456,8 @@ sidekiq['listen_port'] = __PORT_SIDEKIQ__ # postgresql['connect_port'] = 5432 ##! **recommend value is 1/4 of total RAM, up to 14GB.** +# For Docker containers, the default of 256 MB is set in docker/assets/gitlab.rb. +# Otherwise, 1/4 of the total RAM is used in files/gitlab-cookbooks/postgresql/attributes/default.rb. # postgresql['shared_buffers'] = "256MB" ### Advanced settings @@ -1659,7 +1661,7 @@ sidekiq['listen_port'] = __PORT_SIDEKIQ__ ###! **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 -###! https://docs.gitlab.com/ee/administration/high_availability/redis.html +###! https://docs.gitlab.com/ee/administration/redis/replication_and_failover.html # redis_master_role['enable'] = true # redis_replica_role['enable'] = true @@ -1672,7 +1674,7 @@ sidekiq['listen_port'] = __PORT_SIDEKIQ__ ###! **You need a master replica Redis replication to be able to do failover** ###! **Please read the documentation before enabling it to understand the ###! caveats:** -###! Docs: https://docs.gitlab.com/ee/administration/high_availability/redis.html +###! Docs: https://docs.gitlab.com/ee/administration/redis/replication_and_failover.html ### Replication support #### Replica Redis instance @@ -1758,7 +1760,6 @@ nginx['client_max_body_size'] = '__CLIENT_MAX_BODY_SIZE__' # nginx['ssl_prefer_server_ciphers'] = "off" ##! **Recommended by: https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html -##! https://cipherli.st/** # nginx['ssl_protocols'] = "TLSv1.2 TLSv1.3" ##! **Recommended in: https://nginx.org/en/docs/http/ngx_http_ssl_module.html** @@ -1775,7 +1776,7 @@ nginx['client_max_body_size'] = '__CLIENT_MAX_BODY_SIZE__' # nginx['listen_addresses'] = ['*', '[::]'] ##! **Defaults to forcing web browsers to always communicate using only HTTPS** -##! Docs: https://docs.gitlab.com/omnibus/settings/nginx.html#setting-http-strict-transport-security +##! Docs: https://docs.gitlab.com/omnibus/settings/ssl/#configure-the-http-strict-transport-security-hsts # nginx['hsts_max_age'] = 63072000 # nginx['hsts_include_subdomains'] = false @@ -1790,11 +1791,11 @@ nginx['client_max_body_size'] = '__CLIENT_MAX_BODY_SIZE__' nginx['listen_port'] = __PORT__ ##! **Override only if your reverse proxy internally communicates over HTTP** -##! Docs: https://docs.gitlab.com/omnibus/settings/nginx.html#supporting-proxied-ssl +##! Docs: https://docs.gitlab.com/omnibus/settings/ssl/#configure-a-reverse-proxy-or-load-balancer-ssl-termination nginx['listen_https'] = false ##! **Override only if you use a reverse proxy with proxy protocol enabled** -##! Docs: https://docs.gitlab.com/omnibus/settings/nginx.html#configuring-proxy-protocol +##! Docs: https://docs.gitlab.com/omnibus/settings/nginx.html#configuring-the-proxy-protocol # nginx['proxy_protocol'] = false # nginx['custom_gitlab_server_config'] = "location ^~ /foo-namespace/bar-project/raw/ {\n deny all;\n}\n" @@ -1933,7 +1934,7 @@ nginx['listen_https'] = false ################################################################################ ## Runtime directory -##! Docs: https://docs.gitlab.com//omnibus/settings/configuration.html#configuring-runtime-directory +##! Docs: https://docs.gitlab.com//omnibus/settings/configuration.html#configure-the-runtime-directory ################################################################################ # runtime_dir '/run' @@ -2280,7 +2281,7 @@ nginx['listen_https'] = false ################################################################################ ## GitLab Mattermost -##! Docs: https://docs.gitlab.com/omnibus/gitlab-mattermost +##! Docs: https://docs.gitlab.com/ee/integration/mattermost/ ################################################################################ # mattermost_external_url 'http://mattermost.example.com' @@ -2373,7 +2374,6 @@ nginx['listen_https'] = false ###! **To enable only Monitoring service in this machine, uncomment ###! the line below.** -###! Docs: https://docs.gitlab.com/ee/administration/high_availability # monitoring_role['enable'] = true # prometheus['enable'] = true @@ -2400,7 +2400,7 @@ nginx['listen_https'] = false # Prometheus can scrape additional jobs via scrape_configs. The default automatically # includes all of the exporters supported by the omnibus config. # -# See: https://prometheus.io/docs/operating/configuration/# +# See: https://prometheus.io/docs/operating/configuration/#scrape_config # # Example: # @@ -2869,7 +2869,7 @@ nginx['listen_https'] = false # letsencrypt['key_size'] = 2048 # letsencrypt['owner'] = 'root' # letsencrypt['wwwroot'] = '/var/opt/gitlab/nginx/www' -# See http://docs.gitlab.com/omnibus/settings/ssl.html#automatic-renewal for more on these sesttings +# See https://docs.gitlab.com/omnibus/settings/ssl/index.html#renew-the-certificates-automatically for more on these settings # letsencrypt['auto_renew'] = true # letsencrypt['auto_renew_hour'] = 0 # letsencrypt['auto_renew_minute'] = nil # Should be a number or cron expression, if specified. @@ -2991,7 +2991,7 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__ ################################################################################ ## GitLab Sentinel (EE Only) -##! Docs: http://docs.gitlab.com/ce/administration/high_availability/redis.html#high-availability-with-sentinel +##! Docs: https://docs.gitlab.com/ee/administration/redis/replication_and_failover.html ################################################################################ ##! **Make sure you configured all redis['master_*'] keys above before @@ -2999,7 +2999,7 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__ ##! To enable Sentinel and disable all other services in this machine, ##! uncomment the line below (if you've enabled Redis role, it will keep it). -##! Docs: https://docs.gitlab.com/ee/administration/high_availability/redis.html +##! Docs: https://docs.gitlab.com/ee/administration/redis/replication_and_failover.html # redis_sentinel_role['enable'] = true # sentinel['enable'] = true @@ -3093,16 +3093,16 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__ ################################################################################ ## Additional Database Settings (EE only) -##! Docs: https://docs.gitlab.com/ee/administration/database_load_balancing.html +##! Docs: https://docs.gitlab.com/ee/administration/postgresql/database_load_balancing.html ################################################################################ # gitlab_rails['db_load_balancing'] = { 'hosts' => ['secondary1.example.com'] } ################################################################################ ## GitLab Geo -##! Docs: https://docs.gitlab.com/ee/gitlab-geo +##! Docs: https://docs.gitlab.com/ee/administration/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/index.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 @@ -3172,8 +3172,8 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__ ################################################################################ # Pgbouncer (EE only) -# See [GitLab PgBouncer documentation](https://docs.gitlab.com/ee/administration/postgresql/pgbouncer.html) -# See the [PgBouncer page](https://pgbouncer.github.io/config.html) for details +# See the GitLab PgBouncer documentation: https://docs.gitlab.com/ee/administration/postgresql/pgbouncer.html +# See the PgBouncer page http://www.pgbouncer.org/config.html for details ################################################################################ # pgbouncer['enable'] = false # pgbouncer['log_directory'] = '/var/log/gitlab/pgbouncer' @@ -3459,7 +3459,7 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__ ### Service desk email ###! Allow users to create new service desk issues by sending an email to ###! service desk address. -###! Docs: https://docs.gitlab.com/ee/user/project/service_desk.html +###! Docs: https://docs.gitlab.com/ee/user/project/service_desk/index.html # gitlab_rails['service_desk_email_enabled'] = false #### Service Desk Mailbox Settings (via `mail_room`) diff --git a/manifest.toml b/manifest.toml index bc2ca97..9f88c82 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.2.1~ynh1" +version = "17.3.1~ynh1" maintainers = ["kay0u"] diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 6f7e12a..859c470 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,22 +1,22 @@ #!/bin/bash -gitlab_version="17.2.1" +gitlab_version="17.3.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="3f6eda84728380787bff751b76cb5ddaffe7f07376ba873de8e33865fc5b671e" -gitlab_x86_64_bullseye_source_sha256="6a82c30d61683ae51cc7442d45d5dcb880ea9343857cf3c59a3aa52fa964eb57" -gitlab_x86_64_buster_source_sha256="0f89798b7df3a904d454238926d1accf9b71b543f2b8c7113d42061bcf342a13" +gitlab_x86_64_bookworm_source_sha256="62fa53982c28d97d06bf5d472503a75239b71a5084a04899026fe30d94072777" +gitlab_x86_64_bullseye_source_sha256="6e6136eb00fcc63e60af460b332fe9d65c7ecb37e87fd98c2881584206f34f1f" +gitlab_x86_64_buster_source_sha256="68448990a6d12fcd6c24ab22626907cbe17b02f58bc62db8d20759d2193f2a4c" -gitlab_arm64_bookworm_source_sha256="39ca066d25ca23642bb7d6e1a6df4dcfeefa6638a3e33127b2969b243984eb13" -gitlab_arm64_bullseye_source_sha256="cc7b86ca2fd3b72c8f14c57d5b4742b82fc7db24de217c1072076218654bca5f" -gitlab_arm64_buster_source_sha256="fc6893c6c545551886db6800f85dd2bd7c135e5a09fdd78d86305b90a4f67fd1" +gitlab_arm64_bookworm_source_sha256="4bb5ba840b53deb9f3779b4ebfbb177852a0bddca8cc0f462b3746a213e3b8bc" +gitlab_arm64_bullseye_source_sha256="a147cbc7339b5f050b5e4a9d3f5bf34eb783313c65dd6c43a813397be58908e0" +gitlab_arm64_buster_source_sha256="868a9e57b39bbb6644afb155ae8bda756bc7381c6ad46821c2c596b3ffe763c3" -gitlab_arm_bookworm_source_sha256="" -gitlab_arm_bullseye_source_sha256="cd3d23bca99147a47485e061c04b28fc8784db05cadccb1d044ba2e95a13dd55" -gitlab_arm_buster_source_sha256="d1cc0e2327a3ebd9a08adec1f3d3ab3b48daf2c0eb61fb737635130e94e3bce7" +gitlab_arm_bookworm_source_sha256="8cd646aa3b8e207559e48904c84792d22d0964524652a8211870845561fe4bd0" +gitlab_arm_bullseye_source_sha256="242bf38fa03de6b3f96e92c578a2a23f8eedc45bf2eefe995b8328c82ebb9151" +gitlab_arm_buster_source_sha256="2e70c86e5b9197ccb57d475521a95511ca35340e5dc1d0d3a67cfe9a959202ad" architecture=$(ynh_app_setting_get --app="$app" --key=architecture)