diff --git a/README.md b/README.md index cee6dcf..5f96760 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.0.4 +**Shipped version:** 13.1.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 05cd680..90aa85f 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.0.4 +**Version incluse :** 13.1.0 ## Captures d'écran diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 520295e..4238211 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -103,6 +103,17 @@ external_url '__GENERATED_EXTERNAL_URL__' # gitlab_rails['gitlab_username_changing_enabled'] = true ### Default Theme +### Available values: +##! `1` for Indigo +##! `2` for Dark +##! `3` for Light +##! `4` for Blue +##! `5` for Green +##! `6` for Light Indigo +##! `7` for Light Blue +##! `8` for Light Green +##! `9` for Red +##! `10` for Light Red # gitlab_rails['gitlab_default_theme'] = 2 ### Default project feature settings @@ -792,7 +803,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ ##! Long polling duration for job requesting for runners # gitlab_workhorse['api_ci_long_polling_duration'] = "60s" -##! Log format: default is text, can also be json or none. +##! Log format: default is json, can also be text or none. # gitlab_workhorse['log_format'] = "json" # gitlab_workhorse['env_directory'] = "/opt/gitlab/etc/gitlab-workhorse/env" @@ -827,7 +838,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ ##! Docs: https://docs.gitlab.com/omnibus/settings/unicorn.html ################################################################################ -unicorn['enable'] = false +# unicorn['enable'] = false # unicorn['worker_timeout'] = 60 ###! Minimum worker_processes is 2 at this moment ###! See https://gitlab.com/gitlab-org/gitlab-foss/issues/18771 @@ -960,6 +971,12 @@ sidekiq['listen_port'] = __SIDEKIQ_PORT__ # postgresql['enable'] = true # postgresql['listen_address'] = nil # postgresql['port'] = 5432 + +## Only used when Patroni is enabled. This is the port that PostgreSQL responds to other +## cluster members. This port is used by Patroni to advertize the PostgreSQL connection +## endpoint to the cluster. By default it is the same as postgresql['port']. +# postgresql['connect_port'] = 5432 + # postgresql['data_dir'] = "/var/opt/gitlab/postgresql/data" ##! **recommend value is 1/4 of total RAM, up to 14GB.** @@ -1286,7 +1303,7 @@ nginx['listen_https'] = false # nginx['gzip_http_version'] = "1.0" # nginx['gzip_comp_level'] = "2" # nginx['gzip_proxied'] = "any" -# nginx['gzip_types'] = [ "text/html", "text/plain", "text/css", "application/x-javascript", "text/xml", "application/xml", "application/xml+rss", "text/javascript", "application/json" ] +# nginx['gzip_types'] = [ "text/plain", "text/css", "application/x-javascript", "text/xml", "application/xml", "application/xml+rss", "text/javascript", "application/json" ] # nginx['keepalive_timeout'] = 65 # nginx['cache_max_size'] = '5000m' # nginx['server_names_hash_bucket_size'] = 64 @@ -1437,9 +1454,6 @@ nginx['listen_https'] = false ##! Listen for requests forwarded by reverse proxy # gitlab_pages['listen_proxy'] = "localhost:8090" -##! Configure GitLab Pages to use an HTTP Proxy -# gitlab_pages['http_proxy'] = "http://example:8080" - # gitlab_pages['redirect_http'] = true # gitlab_pages['use_http2'] = true # gitlab_pages['dir'] = "/var/opt/gitlab/gitlab-pages" @@ -1917,11 +1931,11 @@ nginx['listen_https'] = false # praefect['wrapper_path'] = "/opt/gitlab/embedded/bin/gitaly-wrapper" # praefect['virtual_storage_name'] = "praefect" # praefect['failover_enabled'] = false -# praefect['failover_election_strategy'] = 'local' +# praefect['failover_election_strategy'] = 'sql' +# praefect['failover_read_only_after_failover'] = true # praefect['auth_token'] = "" # praefect['auth_transitioning'] = false # praefect['listen_addr'] = "localhost:2305" -# praefect['postgres_queue_enabled'] = false # praefect['prometheus_listen_addr'] = "localhost:9652" # praefect['prometheus_grpc_latency_buckets'] = "[0.001, 0.005, 0.025, 0.1, 0.5, 1.0, 10.0, 30.0, 60.0, 300.0, 1500.0]" # praefect['logging_level'] = "warn" @@ -2168,7 +2182,7 @@ nginx['listen_https'] = false # 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_rails['geo_registry_replication_primary_api_url'] = 'https://example.com:5050' ################################################################################ @@ -2372,6 +2386,63 @@ nginx['listen_https'] = false # repmgr['daemon'] = true # repmgrd['enable'] = true +################################################################################ +# Patroni (EE only) +# +# NOTICE: Patroni is an experimental feature and subject to change. +# +################################################################################ +# patroni['enable'] = false + +# patroni['dir'] = '/var/opt/gitlab/patroni' +# patroni['data_dir'] = '/var/opt/gitlab/patroni/data' +# patroni['ctl_command'] = '/opt/gitlab/embedded/bin/patronictl' + +# patroni['scope'] = 'gitlab-postgresql-ha' +# patroni['name'] = nil + +# patroni['log_directory'] = '/var/log/gitlab/patroni' +# patroni['log_level'] = 'INFO' + +# patroni['consul']['url'] = 'http://127.0.0.1:8500' +# patroni['consul']['service_check_interval'] = '10s' +# patroni['consul']['register_service'] = false +# patroni['consul']['checks'] = [] + +## Bootstrap settings +# patroni['loop_wait'] = 10 +# patroni['ttl'] = 30 +# patroni['retry_timeout'] = 10 +# patroni['maximum_lag_on_failover'] = 1_048_576 +# patroni['max_timelines_history'] = 0 +# patroni['master_start_timeout'] = 300 + +## PostgreSQL configuration override +# patroni['postgresql']['wal_level'] = 'replica' +# patroni['postgresql']['hot_standby'] = 'on' +# patroni['postgresql']['wal_keep_segments'] = 8 +# patroni['postgresql']['max_wal_senders'] = 5 +# patroni['postgresql']['max_replication_slots'] = 5 +# patroni['postgresql']['checkpoint_timeout'] = 30 + +# patroni['use_pg_rewind'] = false +# patroni['use_slots'] = true + +## The address and port that Patroni API binds to and listens on. +# patroni['listen_address'] = nil +# patroni['port'] = '8008' + +## The address of the Patroni node that is advertized to other cluster +## members to communicate with its API and PostgreSQL. If it is not specified, +## it tries to use the first available private IP and falls back to the default +## network interface. +# patroni['connect_address'] = nil + +## The port that Patroni API responds to other cluster members. This port is +## advertized and by default is the same as patroni['port']. +# patroni['connect_port'] = '8008' + + ################################################################################ # Consul (EEP only) ################################################################################ diff --git a/manifest.json b/manifest.json index e34c20e..c06c406 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "13.0.4~ynh1", + "version": "13.1.0~ynh1", "description": { "en": "Git-repository manager.", "fr": "Gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.11.last.sh b/scripts/upgrade.d/upgrade.11.last.sh index b25d5f4..f48b76d 100644 --- a/scripts/upgrade.d/upgrade.11.last.sh +++ b/scripts/upgrade.d/upgrade.11.last.sh @@ -1,3 +1,5 @@ +#!/bin/bash + gitlab_version="11.11.5" # There is no buster version for gitlab 11.X diff --git a/scripts/upgrade.d/upgrade.12.first.sh b/scripts/upgrade.d/upgrade.12.first.sh index f814a09..b04b05a 100644 --- a/scripts/upgrade.d/upgrade.12.first.sh +++ b/scripts/upgrade.d/upgrade.12.first.sh @@ -1,3 +1,5 @@ +#!/bin/bash + # It's required to upgrade to the latest 12.0.x version before to another 12.X verion. gitlab_version="12.0.12" diff --git a/scripts/upgrade.d/upgrade.12.last.sh b/scripts/upgrade.d/upgrade.12.last.sh index 0e1e218..b54fa08 100644 --- a/scripts/upgrade.d/upgrade.12.last.sh +++ b/scripts/upgrade.d/upgrade.12.last.sh @@ -1,4 +1,6 @@ -gitlab_version="12.10.9" +#!/bin/bash + +gitlab_version="12.10.11" # sha256sum found here: https://packages.gitlab.com/gitlab @@ -6,12 +8,12 @@ gitlab_x86_64_debian_version="$(lsb_release -sc)" if [ "$gitlab_x86_64_debian_version" = "buster" ] then - gitlab_x86_64_source_sha256="09b87fa74ee1c0c6fec6b01fea1dfe76f31be89bb3fc761c89552250b462cd49" + gitlab_x86_64_source_sha256="1e5564604ddeb6bd8b152856e81a01230b5c66e41e1c07ac9f9f7c4593245b3c" else - gitlab_x86_64_source_sha256="c80a72d87cbc1c0f0acb919afa2930b1b1b016b1e0478d09e03bbedc12948960" + gitlab_x86_64_source_sha256="75bff35148b64cf08cd428103c5fc90b597b5f20b4feede38019bdcaa33a3fda" fi -gitlab_arm_source_sha256="c8632f81b94bec91caf8e912070d846a4f9e165f46d7a84ecae83a4ae12d5cda" +gitlab_arm_source_sha256="07581f11cf2c76fe00afb7577df14fec86af1aa9c5ea6b3aea4997397e5915c6" gitlab_filename="gitlab-ce-${gitlab_version}.deb" diff --git a/scripts/upgrade.d/upgrade.13.first.sh b/scripts/upgrade.d/upgrade.13.first.sh new file mode 100644 index 0000000..c90e212 --- /dev/null +++ b/scripts/upgrade.d/upgrade.13.first.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +gitlab_version="13.0.6" + +# sha256sum found here: https://packages.gitlab.com/gitlab + +gitlab_x86_64_debian_version="$(lsb_release -sc)" + +if [ "$gitlab_x86_64_debian_version" = "buster" ] +then + gitlab_x86_64_source_sha256="91a3486de88d1f0ce108d0f0c9adafc83e24c678e5ce2750ec8d52d75e467c1d" +else + gitlab_x86_64_source_sha256="175df478d80d15cbc19b69dee0c312058ba0530bed34f13050a25bb5b280315c" +fi + +gitlab_arm_source_sha256="cfd4f0f72ec2068d1566dd8699adedef210ada30644885e0d74beded3dd1b2b3" + +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 +} \ No newline at end of file diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index e79c9bf..39d6043 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,4 +1,6 @@ -gitlab_version="13.0.4" +#!/bin/bash + +gitlab_version="13.1.0" # sha256sum found here: https://packages.gitlab.com/gitlab @@ -6,12 +8,14 @@ gitlab_x86_64_debian_version="$(lsb_release -sc)" if [ "$gitlab_x86_64_debian_version" = "buster" ] then - gitlab_x86_64_source_sha256="a98cdf17d2231b4ef1b4a4e2b743b0701aab6702552fad9c60d92e2c2928fc43" -else - gitlab_x86_64_source_sha256="e806c80281f7b5b7c00a7c342072b137aa1fdf06db934855babee4d168c2fd2b" -fi + gitlab_x86_64_source_sha256="0ea54906b2f29f0bfcc9d4cad99ea399966055b1418633d0f62d46aea020877d" -gitlab_arm_source_sha256="5e85e991bb1554ce5fa967e978c0b6870675df3cec2a99e8c4c5dabc28b94967" + gitlab_arm_source_sha256="2f7b2cc169a6de6152abf927214ee47f26634a5fa24ee55535ba7bb5074fd2b5" +else + gitlab_x86_64_source_sha256="c16d69de22fa701dbb4755756544c839ae82a519ac3516901f644add89ff1767" + + gitlab_arm_source_sha256="f24b6f085b1b1a426a277085b51f17d6821aaca8ff12dd888b4d294ecb9fef68" +fi gitlab_filename="gitlab-ce-${gitlab_version}.deb"