diff --git a/README.md b/README.md index 904fb65..ab29cda 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,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:** 13.8.4 +**Shipped version:** 13.9.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 31ce49a..0f5e039 100644 --- a/README_fr.md +++ b/README_fr.md @@ -12,7 +12,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour GitLab est un gestionnaire Web de dépôt Git fournissant des fonctionnalités de wiki, de rapports de bugs et de pipeline CI/CD. GitLab est une application open source développée par GitLab Inc. -**Version incluse :** 13.8.4 +**Version incluse :** 13.9.0 ## Captures d'écran diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 87f5360..a1b77ee 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -435,6 +435,9 @@ external_url '__GENERATED_EXTERNAL_URL__' ### Impersonation settings # gitlab_rails['impersonation_enabled'] = true +### Application settings cache expiry in seconds. (default: 60) +# gitlab_rails['application_settings_cache_seconds'] = 60 + ### Usage Statistics # gitlab_rails['usage_ping_enabled'] = true @@ -655,6 +658,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # gitlab_rails['extra_google_tag_manager_id'] = '_your_tracking_id' # gitlab_rails['extra_matomo_url'] = '_your_matomo_url' # gitlab_rails['extra_matomo_site_id'] = '_your_matomo_site_id' +# gitlab_rails['extra_matomo_disable_cookies'] = false ##! Docs: https://docs.gitlab.com/omnibus/settings/environment-variables.html # gitlab_rails['env'] = { @@ -1299,6 +1303,11 @@ sidekiq['listen_port'] = __SIDEKIQ_PORT__ # redis['lazyfree_lazy_server_del'] = true # redis['replica_lazy_flush'] = true +#####! Redis threaded I/O +#####! Defaults to disabled +# redis['io_threads'] = 4 +# redis['io_threads_do_reads'] = true + ################################################################################ ## GitLab Web server ##! Docs: https://docs.gitlab.com/omnibus/settings/nginx.html#using-a-non-bundled-web-server @@ -1591,8 +1600,9 @@ nginx['listen_https'] = false # gitlab_pages['gitlab_secret'] = nil # Generated if not present # gitlab_pages['auth_redirect_uri'] = nil # Defaults to projects subdomain of pages_external_url and + '/auth' # gitlab_pages['gitlab_server'] = nil # Defaults to external_url -# gitlab_pages['internal_gitlab_server'] = nil # defaults to gitlab_server, can be changed to internal load balancer +# gitlab_pages['internal_gitlab_server'] = nil # Defaults to gitlab_server, can be changed to internal load balancer # gitlab_pages['auth_secret'] = nil # Generated if not present +# gitlab_pages['auth_scope'] = nil # Defaults to api, can be changed to read_api to increase security ##! GitLab API HTTP client connection timeout # gitlab_pages['gitlab_client_http_timeout'] = "10s" @@ -2131,23 +2141,28 @@ nginx['listen_https'] = false # praefect['logging_format'] = "json" # praefect['virtual_storages'] = { # 'default' => { -# 'praefect-internal-0' => { -# 'address' => 'tcp://10.23.56.78:8075', -# 'token' => 'abc123' -# }, -# 'praefect-internal-1' => { -# 'address' => 'tcp://10.76.23.31:8075', -# 'token' => 'xyz456' +# 'default_replication_factor' => 3, +# 'nodes' => { +# 'praefect-internal-0' => { +# 'address' => 'tcp://10.23.56.78:8075', +# 'token' => 'abc123' +# }, +# 'praefect-internal-1' => { +# 'address' => 'tcp://10.76.23.31:8075', +# 'token' => 'xyz456' +# } # } # }, # 'alternative' => { -# 'praefect-internal-2' => { -# 'address' => 'tcp://10.34.1.16:8075', -# 'token' => 'abc321' -# }, -# 'praefect-internal-3' => { -# 'address' => 'tcp://10.23.18.6:8075', -# 'token' => 'xyz890' +# 'nodes' => { +# 'praefect-internal-2' => { +# 'address' => 'tcp://10.34.1.16:8075', +# 'token' => 'abc321' +# }, +# 'praefect-internal-3' => { +# 'address' => 'tcp://10.23.18.6:8075', +# 'token' => 'xyz890' +# } # } # } # } @@ -2195,6 +2210,10 @@ nginx['listen_https'] = false ##! non-docker containers. Recommended not to change. # package['detect_init'] = true +##! Attempt to modify kernel paramaters. To skip this in containers where the +##! relevant file system is read-only, set the value to false. +# package['modify_kernel_parameters'] = true + ##! Specify maximum number of tasks that can be created by the systemd unit ##! Will be populated as TasksMax value to the unit file if user is on a systemd ##! version that supports it (>= 227). Will be a no-op if user is not on systemd. diff --git a/manifest.json b/manifest.json index d3cd4f2..133cff3 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "GitLab", "id": "gitlab", "packaging_format": 1, - "version": "13.8.4~ynh1", + "version": "13.9.0~ynh1", "description": { "en": "Git-repository manager.", "fr": "Gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 6e435fa..8fabfb5 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,13 +1,13 @@ #!/bin/bash -gitlab_version="13.8.4" +gitlab_version="13.9.0" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="buster" -gitlab_x86_64_buster_source_sha256="571297ac5765ee2cbd513d7cb083b81a69a077c8db61fee4bd266f79815692b8" +gitlab_x86_64_buster_source_sha256="5642866110f64ce3a424d312b0779e249595acbcfcb1edff81e6d6c0345db3ce" -gitlab_arm_buster_source_sha256="849d0de1857618e19d6fca1f7a24be18cb09d14c4a163c5af71b06477cab2f29" +gitlab_arm_buster_source_sha256="4bb579c84a854c0759d2b67f123d1a0ffb96743edf8fce6cbbef5d40147bbde4" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) @@ -21,9 +21,5 @@ gitlab_filename="gitlab-ce-${gitlab_version}.deb" # Action to do in case of failure of the package_check package_check_action() { - local sysctl_file="$final_path/embedded/cookbooks/package/resources/gitlab_sysctl.rb" - ynh_replace_string --match_string="command \"sysctl -e \(.*\)\"" --replace_string="command \"sysctl -e \1 || true\"" --target_file=$sysctl_file - - sysctl_file="/opt/gitlab/embedded/cookbooks/package/recipes/sysctl.rb" - ynh_replace_string --match_string="command \"sysctl -e \(.*\)\"" --replace_string="command \"sysctl -e \1 || true\"" --target_file=$sysctl_file + ynh_replace_string --match_string="# package\['modify_kernel_parameters'\] = true" --replace_string="package['modify_kernel_parameters'] = false" --target_file="$config_path/gitlab.rb" }