From 13c7328c8e637f2e6ea2c524ae022b184e638af7 Mon Sep 17 00:00:00 2001 From: kay0u Date: Sun, 22 Sep 2019 15:10:19 +0200 Subject: [PATCH] 12.3.0 --- README.md | 2 +- conf/gitlab.rb | 37 ++++++++++++++++++++++--------- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 ++--- 4 files changed, 32 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 94cc5fe..a40a80d 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to GitLab is a web-based Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features, using an open-source license, developed by GitLab Inc. -**Shipped version:** 12.2.5 +**Shipped version:** 12.3.0 ## Screenshots diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 3d28a80..eb0d1fd 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -324,6 +324,7 @@ EOS # gitlab_rails['smartcard_ca_file'] = "/etc/gitlab/ssl/CA.pem" # gitlab_rails['smartcard_client_certificate_required_port'] = 3444 # gitlab_rails['smartcard_required_for_git_access'] = false +# gitlab_rails['smartcard_san_extensions'] = false ### OmniAuth Settings ###! Docs: https://docs.gitlab.com/ce/integration/omniauth.html @@ -337,6 +338,7 @@ EOS # gitlab_rails['omniauth_auto_link_ldap_user'] = false # gitlab_rails['omniauth_auto_link_saml_user'] = false # gitlab_rails['omniauth_external_providers'] = ['twitter', 'google_oauth2'] +# gitlab_rails['omniauth_allow_bypass_two_factor'] = ['google_oauth2'] # gitlab_rails['omniauth_providers'] = [ # { # "name" => "google_oauth2", @@ -381,6 +383,11 @@ EOS ###! include 'STANDARD', 'STANDARD_IA', and 'REDUCED_REDUNDANCY'** # gitlab_rails['backup_storage_class'] = 'STANDARD' +###! Skip parts of the backup. Comma separated. +###! Docs: https://docs.gitlab.com/ee/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup +#gitlab_rails['env'] = { +# "SKIP" => "db,uploads,repositories,builds,artifacts,lfs,registry,pages" +#} ### Pseudonymizer Settings # gitlab_rails['pseudonymizer_manifest'] = 'config/pseudonymizer.yml' @@ -563,6 +570,11 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # gitlab_rails['registry_port'] = "5005" # gitlab_rails['registry_path'] = "/var/opt/gitlab/gitlab-rails/shared/registry" +# Notification secret, it's used to authenticate notification requests to GitLab application +# You only need to change this when you use external Registry service, otherwise +# it will be taken directly from notification settings of your Registry +# gitlab_rails['registry_notification_secret'] = nil + ###! **Do not change the following 3 settings unless you know what you are ###! doing** # gitlab_rails['registry_api_url'] = "http://localhost:5000" @@ -705,7 +717,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # unicorn['enable'] = true # unicorn['worker_timeout'] = 60 ###! Minimum worker_processes is 2 at this moment -###! See https://gitlab.com/gitlab-org/gitlab-ce/issues/18771 +###! See https://gitlab.com/gitlab-org/gitlab-foss/issues/18771 unicorn['worker_processes'] = __UNICORN_WORKER_PROCESSES__ ### Advanced settings @@ -1580,22 +1592,22 @@ nginx['listen_https'] = false # } ################################################################################ -## Prometheus Gitlab monitor -##! Docs: https://docs.gitlab.com/ce/administration/monitoring/prometheus/gitlab_monitor_exporter.html +## Prometheus Gitlab exporter +##! Docs: https://docs.gitlab.com/ce/administration/monitoring/prometheus/gitlab_exporter.html ################################################################################ -# gitlab_monitor['enable'] = true -# gitlab_monitor['log_directory'] = "/var/log/gitlab/gitlab-monitor" -# gitlab_monitor['home'] = "/var/opt/gitlab/gitlab-monitor" +# gitlab_exporter['enable'] = true +# gitlab_exporter['log_directory'] = "/var/log/gitlab/gitlab-exporter" +# gitlab_exporter['home'] = "/var/opt/gitlab/gitlab-exporter" ##! Advanced settings. Should be changed only if absolutely needed. -# gitlab_monitor['listen_address'] = 'localhost' -# gitlab_monitor['listen_port'] = '9168' +# gitlab_exporter['listen_address'] = 'localhost' +# gitlab_exporter['listen_port'] = '9168' -##! Manage gitlab-monitor sidekiq probes. false by default when Sentinels are +##! Manage gitlab-exporter sidekiq probes. false by default when Sentinels are ##! found. -# gitlab_monitor['probe_sidekiq'] = true +# gitlab_exporter['probe_sidekiq'] = true # To completely disable prometheus, and all of it's exporters, set to false # prometheus_monitoring['enable'] = true @@ -1692,6 +1704,7 @@ grafana['enable'] = false # gitaly['auth_transitioning'] = false # When true, auth is logged to Prometheus but NOT enforced # gitaly['graceful_restart_timeout'] = '1m' # Grace time for a gitaly process to finish ongoing requests # gitaly['git_catfile_cache_size'] = 100 # Number of 'git cat-file' processes kept around for re-use +# gitaly['open_files_ulimit'] = 15000 # Maximum number of open files allowed for the gitaly process # gitaly['ruby_max_rss'] = 300000000 # RSS threshold in bytes for triggering a gitaly-ruby restart # gitaly['ruby_graceful_restart_timeout'] = '10m' # Grace time for a gitaly-ruby process to finish ongoing requests # gitaly['ruby_restart_delay'] = '5m' # Period of sustained high RSS that needs to be observed before restarting gitaly-ruby @@ -1941,6 +1954,10 @@ grafana['enable'] = false # If it is blank, it defaults to external_url. # gitlab_rails['geo_node_name'] = nil +# gitlab_rails['geo_registry_replication_enabled'] = true +# gitlab_rails['geo_registry_replication_primary_api_url'] = 'https://example.com:5000' + + ################################################################################ ## GitLab Geo Secondary (EE only) ################################################################################ diff --git a/manifest.json b/manifest.json index 42d31a8..0dee8d1 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.2.5~ynh1", + "version": "12.3.0~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 7ab0ac4..0210131 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.2.5" +gitlab_version="12.3.0" -gitlab_x86_64_source_sha256="c583dc0ac520ecc5b190410379b935f9d2ae8c644a95f5a93e0423d16f0450f1" +gitlab_x86_64_source_sha256="57789874ddf80b1cfafe9bff7cc8dacb8af92852a48f9459d1b7b29dafae099a" -gitlab_arm_source_sha256="b2b5522b331be7df7c061196065750317c4819313ce963a96e557a04fba6ccaf" +gitlab_arm_source_sha256="06ea031f23ba9375e014b142c53da12fa76587f3039c6c1a97952a9b1d271b85" gitlab_filename="gitlab-ce-${gitlab_version}.deb"