diff --git a/README.md b/README.md index 87ed120..f2ddf19 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features. -**Shipped version:** 14.3.2~ynh1 +**Shipped version:** 14.4.0~ynh1 **Demo:** https://gitlab.com/explore @@ -46,7 +46,6 @@ How to configure GitLab: ## Documentation and resources * Official app website: https://gitlab.com -* Official user documentation: https://yunohost.org/fr/app_gitlab * Official admin documentation: https://docs.gitlab.com/ * Upstream app code repository: https://gitlab.com/gitlab-org/omnibus-gitlab - https://gitlab.com/gitlab-org/gitlab * YunoHost documentation for this app: https://yunohost.org/app_gitlab diff --git a/README_fr.md b/README_fr.md index ece95f4..037a39b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD. -**Version incluse :** 14.3.2~ynh1 +**Version incluse :** 14.4.0~ynh1 **Démo :** https://gitlab.com/explore @@ -42,7 +42,6 @@ Comment configurer GitLab : ## Documentations et ressources * Site officiel de l'app : https://gitlab.com -* Documentation officielle utilisateur : https://yunohost.org/fr/app_gitlab * Documentation officielle de l'admin : https://docs.gitlab.com/ * Dépôt de code officiel de l'app : https://gitlab.com/gitlab-org/omnibus-gitlab - https://gitlab.com/gitlab-org/gitlab * Documentation YunoHost pour cette app : https://yunohost.org/app_gitlab diff --git a/conf/gitlab.rb b/conf/gitlab.rb index c3af0b7..46c0ae3 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -573,6 +573,7 @@ EOS # } # ] # gitlab_rails['omniauth_cas3_session_duration'] = 28800 +# gitlab_rails['omniauth_saml_message_max_byte_size'] = 250000 ### FortiAuthenticator authentication settings # gitlab_rails['forti_authenticator_enabled'] = false @@ -790,6 +791,8 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # gitlab_rails['redis_trace_chunks_sentinels'] = nil # gitlab_rails['redis_actioncable_instance'] = nil # gitlab_rails['redis_actioncable_sentinels'] = nil +# gitlab_rails['redis_rate_limiting_instance'] = nil +# gitlab_rails['redis_rate_limiting_sentinels'] = nil ################################################################################ ## Container Registry settings @@ -1132,6 +1135,8 @@ sidekiq['listen_port'] = __SIDEKIQ_PORT__ # postgresql['log_truncate_on_rotation'] = nil # postgresql['log_rotation_age'] = nil # postgresql['log_rotation_size'] = nil +##! 'username' affects the system and PostgreSQL user accounts created during installation and cannot be changed +##! on an existing installation. See https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/3606 for more details. # postgresql['username'] = "gitlab-psql" # postgresql['group'] = "gitlab-psql" ##! `SQL_USER_PASSWORD_HASH` can be generated using the command `gitlab-ctl pg-password-md5 gitlab` @@ -1268,6 +1273,7 @@ sidekiq['listen_port'] = __SIDEKIQ_PORT__ # redis['maxmemory'] = "0" # redis['maxmemory_policy'] = "noeviction" # redis['maxmemory_samples'] = "5" +# redis['stop_writes_on_bgsave_error'] = true # redis['tcp_backlog'] = 511 # redis['tcp_timeout'] = "60" # redis['tcp_keepalive'] = "300" @@ -1637,10 +1643,6 @@ nginx['listen_https'] = false # gitlab_pages['artifacts_server_url'] = nil # Defaults to external_url + '/api/v4' # gitlab_pages['artifacts_server_timeout'] = 10 -##! Environments that do not support bind-mounting should set this parameter to -##! true. This is incompatible with the artifacts server -# gitlab_pages['inplace_chroot'] = false - ##! Prometheus metrics for Pages docs: https://gitlab.com/gitlab-org/gitlab-pages/#enable-prometheus-metrics # gitlab_pages['metrics_address'] = ":9235" diff --git a/manifest.json b/manifest.json index 1b6df43..5637fcf 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "GitLab", "id": "gitlab", "packaging_format": 1, - "version": "14.3.2~ynh1", + "version": "14.4.0~ynh1", "description": { "en": "Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features.", "fr": "Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD." @@ -13,7 +13,6 @@ "website": "https://gitlab.com", "demo": "https://gitlab.com/explore", "admindoc": "https://docs.gitlab.com/", - "userdoc": "https://yunohost.org/fr/app_gitlab", "code": "https://gitlab.com/gitlab-org/omnibus-gitlab - https://gitlab.com/gitlab-org/gitlab" }, "license": "MIT", @@ -32,23 +31,24 @@ "install": [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", "type": "path", - "example": "/gitlab", "default": "/gitlab" }, { "name": "admin", - "type": "user", - "example": "johndoe" + "type": "user" }, { "name": "is_public", "type": "boolean", + "help": { + "en": "If your Gitlab instance is public, anyone can see your public repositories.", + "fr": "Si votre instance Gitlab est publique, tout le monde pourra voir vos dépôts publics." + }, "default": true }, { diff --git a/scripts/restore b/scripts/restore index d54349d..799759b 100644 --- a/scripts/restore +++ b/scripts/restore @@ -41,10 +41,7 @@ architecture=$(ynh_app_setting_get --app="$app" --key=architecture) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" -test ! -d $final_path \ -|| ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS diff --git a/scripts/upgrade.d/upgrade.13.last.sh b/scripts/upgrade.d/upgrade.13.last.sh index ece2ddd..93dbd51 100644 --- a/scripts/upgrade.d/upgrade.13.last.sh +++ b/scripts/upgrade.d/upgrade.13.last.sh @@ -1,15 +1,15 @@ #!/bin/bash -gitlab_version="13.12.5" +gitlab_version="13.12.12" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="buster" -gitlab_x86_64_buster_source_sha256="3dd65585a09575a207e53d12a81fb506a33954d2f9aa043320e07eec7447f9ef" +gitlab_x86_64_buster_source_sha256="75c74c2d7257d4247e5b0bc0aee774e616f69b58c25f1b48fba097078e971955" -gitlab_arm64_buster_source_sha256="3b92897536f3b44fc13c5e8eab31d18424524e667d26ea074a93de346c5ab4c4" +gitlab_arm64_buster_source_sha256="942191e6f4d4cbce90774c6ec294f6b9322a6c42d1b836826af752af76c88e31" -gitlab_arm_buster_source_sha256="3ffc3d6628321ad11289459c824cd1d81a480cde2574fe98c094f37951235b79" +gitlab_arm_buster_source_sha256="5ebc80181520ab24efe46842d41ada153d3970fd7164e2875afb37de85f2900e" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) diff --git a/scripts/upgrade.d/upgrade.14.first.sh b/scripts/upgrade.d/upgrade.14.first.sh index d7513bc..78e49c7 100644 --- a/scripts/upgrade.d/upgrade.14.first.sh +++ b/scripts/upgrade.d/upgrade.14.first.sh @@ -1,15 +1,15 @@ #!/bin/bash -gitlab_version="14.0.6" +gitlab_version="14.0.11" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="buster" -gitlab_x86_64_buster_source_sha256="2ea56af1df12b823225de4c0ec1d06b1e143ca7d8eea2ab56b82ddeb94a6d0e8" +gitlab_x86_64_buster_source_sha256="b001ff2bf406e44a85e0c799e4cbddb8bc3ccef07246502f7f267032aa77263d" -gitlab_arm64_buster_source_sha256="84530fef7ab7ade92e5e64461fbdea9b22e7264af6005b9782b816d0ac66c77d" +gitlab_arm64_buster_source_sha256="f8d7a9ca77520b7ec045f414a7ac7b28407b9aa8a3825e50cb63cd877e91196a" -gitlab_arm_buster_source_sha256="f3f625c422ecf442d382fbc61222f86b0b0bf635dc96e09e703b2dd8b17cb7ed" +gitlab_arm_buster_source_sha256="5f1de707c840e4a518e99c89b0e90a5c21c32cac91e853f1e12ef054696100dd" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) @@ -20,8 +20,8 @@ elif [ "$architecture" = "arm64" ]; then elif [ "$architecture" = "arm" ]; then # If the version for arm doesn't exist, then use an older one if [ -z "$gitlab_arm_buster_source_sha256" ]; then - gitlab_version="14.0.6" - gitlab_arm_buster_source_sha256="f3f625c422ecf442d382fbc61222f86b0b0bf635dc96e09e703b2dd8b17cb7ed" + gitlab_version="14.0.11" + gitlab_arm_buster_source_sha256="5f1de707c840e4a518e99c89b0e90a5c21c32cac91e853f1e12ef054696100dd" fi gitlab_source_sha256=$gitlab_arm_buster_source_sha256 fi diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 93d9a9c..1ca3430 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,15 +1,15 @@ #!/bin/bash -gitlab_version="14.3.2" +gitlab_version="14.4.0" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="buster" -gitlab_x86_64_buster_source_sha256="74fa8f0911c30b7ab615d67a29d6e5e2f958fe76ac866d36d1fc8a927298c26f" +gitlab_x86_64_buster_source_sha256="89d12148595ac1e5e127ec96ed877e738c28e5eed02328d26b1610341c291d92" -gitlab_arm64_buster_source_sha256="33cfad63ab4c6782f41a8a4a990eade9da4a8faaf2fa718e96a8b02d67fdae3a" +gitlab_arm64_buster_source_sha256="98ec153767bf80c55e12be896f2005658e91ed761715841fbf87bfb41953f961" -gitlab_arm_buster_source_sha256="70ebb828586c5e33a4b4ec58bfe0ca3779cd6e5c421e7b97d9f707d26ab8f62d" +gitlab_arm_buster_source_sha256="e950b5f4fa76d051eddd20ae9cd1aab017f9b0abee41be1fee566ed0b39146ea" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) @@ -20,8 +20,8 @@ elif [ "$architecture" = "arm64" ]; then elif [ "$architecture" = "arm" ]; then # If the version for arm doesn't exist, then use an older one if [ -z "$gitlab_arm_buster_source_sha256" ]; then - gitlab_version="14.3.2" - gitlab_arm_buster_source_sha256="70ebb828586c5e33a4b4ec58bfe0ca3779cd6e5c421e7b97d9f707d26ab8f62d" + gitlab_version="14.4.0" + gitlab_arm_buster_source_sha256="e950b5f4fa76d051eddd20ae9cd1aab017f9b0abee41be1fee566ed0b39146ea" fi gitlab_source_sha256=$gitlab_arm_buster_source_sha256 fi